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

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

Issue 161133004: Re-enable PrerenderBrowserTest.PrerenderRendererCrash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <deque> 5 #include <deque>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 2356 matching lines...) Expand 10 before | Expand all | Expand 10 after
2367 EXPECT_FALSE(UrlIsInPrerenderManager(kHtmlFileB)); 2367 EXPECT_FALSE(UrlIsInPrerenderManager(kHtmlFileB));
2368 2368
2369 // Cancel the prerender. 2369 // Cancel the prerender.
2370 GetPrerenderManager()->CancelAllPrerenders(); 2370 GetPrerenderManager()->CancelAllPrerenders();
2371 prerender->WaitForStop(); 2371 prerender->WaitForStop();
2372 2372
2373 // All prerenders are now gone. 2373 // All prerenders are now gone.
2374 EXPECT_TRUE(IsEmptyPrerenderLinkManager()); 2374 EXPECT_TRUE(IsEmptyPrerenderLinkManager());
2375 } 2375 }
2376 2376
2377 // See crbug.com/131836.
2378 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderTaskManager) { 2377 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderTaskManager) {
2379 // Show the task manager. This populates the model. 2378 // Show the task manager. This populates the model.
2380 chrome::OpenTaskManager(current_browser()); 2379 chrome::OpenTaskManager(current_browser());
2381 // Wait for the model of task manager to start. 2380 // Wait for the model of task manager to start.
2382 TaskManagerBrowserTestUtil::WaitForWebResourceChange(1); 2381 TaskManagerBrowserTestUtil::WaitForWebResourceChange(1);
2383 2382
2384 // Start with two resources. 2383 // Start with two resources.
2385 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); 2384 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1);
2386 2385
2387 // One of the resources that has a WebContents associated with it should have 2386 // One of the resources that has a WebContents associated with it should have
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
2512 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderWindowSize) { 2511 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderWindowSize) {
2513 #else 2512 #else
2514 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderWindowSize) { 2513 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderWindowSize) {
2515 #endif 2514 #endif
2516 PrerenderTestURL("files/prerender/prerender_size.html", 2515 PrerenderTestURL("files/prerender/prerender_size.html",
2517 FINAL_STATUS_USED, 2516 FINAL_STATUS_USED,
2518 1); 2517 1);
2519 NavigateToDestURL(); 2518 NavigateToDestURL();
2520 } 2519 }
2521 2520
2522 // Flakily times out: http://crbug.com/171546
2523 // Checks that prerenderers will terminate when the RenderView crashes. 2521 // Checks that prerenderers will terminate when the RenderView crashes.
2524 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderRendererCrash) { 2522 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderRendererCrash) {
2525 scoped_ptr<TestPrerender> prerender = 2523 scoped_ptr<TestPrerender> prerender =
2526 PrerenderTestURL("files/prerender/prerender_page.html", 2524 PrerenderTestURL("files/prerender/prerender_page.html",
2527 FINAL_STATUS_RENDERER_CRASHED, 2525 FINAL_STATUS_RENDERER_CRASHED,
2528 1); 2526 1);
2529 2527
2530 // Navigate to about:crash and then wait for the renderer to crash. 2528 // Navigate to about:crash and then wait for the renderer to crash.
2531 ASSERT_TRUE(prerender->contents()); 2529 ASSERT_TRUE(prerender->contents());
2532 ASSERT_TRUE(prerender->contents()->prerender_contents()); 2530 ASSERT_TRUE(prerender->contents()->prerender_contents());
2533 prerender->contents()->prerender_contents()->GetController(). 2531 prerender->contents()->prerender_contents()->GetController().
2534 LoadURL( 2532 LoadURL(
(...skipping 1512 matching lines...) Expand 10 before | Expand all | Expand 10 after
4047 } 4045 }
4048 }; 4046 };
4049 4047
4050 // Checks that prerendering works in incognito mode. 4048 // Checks that prerendering works in incognito mode.
4051 IN_PROC_BROWSER_TEST_F(PrerenderIncognitoBrowserTest, PrerenderIncognito) { 4049 IN_PROC_BROWSER_TEST_F(PrerenderIncognitoBrowserTest, PrerenderIncognito) {
4052 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); 4050 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1);
4053 NavigateToDestURL(); 4051 NavigateToDestURL();
4054 } 4052 }
4055 4053
4056 } // namespace prerender 4054 } // namespace prerender
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698