OLD | NEW |
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 <deque> | 5 #include <deque> |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/stringprintf.h" | 9 #include "base/stringprintf.h" |
10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
(...skipping 1335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1346 | 1346 |
1347 // Checks that prerenderers will terminate when the RenderView crashes. | 1347 // Checks that prerenderers will terminate when the RenderView crashes. |
1348 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderRendererCrash) { | 1348 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderRendererCrash) { |
1349 PrerenderTestURL("files/prerender/prerender_page.html", | 1349 PrerenderTestURL("files/prerender/prerender_page.html", |
1350 FINAL_STATUS_RENDERER_CRASHED, | 1350 FINAL_STATUS_RENDERER_CRASHED, |
1351 1); | 1351 1); |
1352 | 1352 |
1353 // Navigate to about:crash and then wait for the renderer to crash. | 1353 // Navigate to about:crash and then wait for the renderer to crash. |
1354 ASSERT_TRUE(GetPrerenderContents()); | 1354 ASSERT_TRUE(GetPrerenderContents()); |
1355 ASSERT_TRUE(GetPrerenderContents()->prerender_contents()); | 1355 ASSERT_TRUE(GetPrerenderContents()->prerender_contents()); |
1356 GetPrerenderContents()->prerender_contents()->controller().LoadURL( | 1356 GetPrerenderContents()->prerender_contents()->tab_contents()->controller(). |
1357 GURL(chrome::kAboutCrashURL), content::Referrer(), | 1357 LoadURL( |
1358 content::PAGE_TRANSITION_TYPED, std::string()); | 1358 GURL(chrome::kAboutCrashURL), |
| 1359 content::Referrer(), |
| 1360 content::PAGE_TRANSITION_TYPED, |
| 1361 std::string()); |
1359 ui_test_utils::RunMessageLoop(); | 1362 ui_test_utils::RunMessageLoop(); |
1360 } | 1363 } |
1361 | 1364 |
1362 // Checks that we correctly use a prerendered page when navigating to a | 1365 // Checks that we correctly use a prerendered page when navigating to a |
1363 // fragment. | 1366 // fragment. |
1364 // DISABLED: http://crbug.com/84154 | 1367 // DISABLED: http://crbug.com/84154 |
1365 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, | 1368 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, |
1366 DISABLED_PrerenderPageNavigateFragment) { | 1369 DISABLED_PrerenderPageNavigateFragment) { |
1367 PrerenderTestURL("files/prerender/prerender_fragment.html", | 1370 PrerenderTestURL("files/prerender/prerender_fragment.html", |
1368 FINAL_STATUS_FRAGMENT_MISMATCH, | 1371 FINAL_STATUS_FRAGMENT_MISMATCH, |
(...skipping 527 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1896 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderSessionStorage) { | 1899 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderSessionStorage) { |
1897 set_loader_path("files/prerender/prerender_loader_with_session_storage.html"); | 1900 set_loader_path("files/prerender/prerender_loader_with_session_storage.html"); |
1898 PrerenderTestURL(GetCrossDomainTestUrl("files/prerender/prerender_page.html"), | 1901 PrerenderTestURL(GetCrossDomainTestUrl("files/prerender/prerender_page.html"), |
1899 FINAL_STATUS_USED, | 1902 FINAL_STATUS_USED, |
1900 1); | 1903 1); |
1901 NavigateToDestURL(); | 1904 NavigateToDestURL(); |
1902 GoBackToPageBeforePrerender(browser()); | 1905 GoBackToPageBeforePrerender(browser()); |
1903 } | 1906 } |
1904 | 1907 |
1905 } // namespace prerender | 1908 } // namespace prerender |
OLD | NEW |