| 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 <deque> | 6 #include <deque> |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <unordered_map> | 9 #include <unordered_map> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 2042 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2053 // Checks that we do not use a prerendered page when we prerender a fragment | 2053 // Checks that we do not use a prerendered page when we prerender a fragment |
| 2054 // but navigate to the main page. | 2054 // but navigate to the main page. |
| 2055 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, | 2055 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, |
| 2056 MAYBE_PrerenderFragmentNavigatePage) { | 2056 MAYBE_PrerenderFragmentNavigatePage) { |
| 2057 PrerenderTestURL("/prerender/no_prerender_page.html#fragment", | 2057 PrerenderTestURL("/prerender/no_prerender_page.html#fragment", |
| 2058 FINAL_STATUS_APP_TERMINATING, 1); | 2058 FINAL_STATUS_APP_TERMINATING, 1); |
| 2059 NavigateToURLWithDisposition("/prerender/no_prerender_page.html", | 2059 NavigateToURLWithDisposition("/prerender/no_prerender_page.html", |
| 2060 WindowOpenDisposition::CURRENT_TAB, false); | 2060 WindowOpenDisposition::CURRENT_TAB, false); |
| 2061 } | 2061 } |
| 2062 | 2062 |
| 2063 // crbug.com/708158 |
| 2064 #if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER) |
| 2065 #define MAYBE_PrerenderFragmentNavigateFragment \ |
| 2066 DISABLED_PrerenderFragmentNavigateFragment |
| 2067 #else |
| 2068 #define MAYBE_PrerenderFragmentNavigateFragment \ |
| 2069 PrerenderFragmentNavigateFragment |
| 2070 #endif |
| 2063 // Checks that we do not use a prerendered page when we prerender a fragment | 2071 // Checks that we do not use a prerendered page when we prerender a fragment |
| 2064 // but navigate to a different fragment on the same page. | 2072 // but navigate to a different fragment on the same page. |
| 2065 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, | 2073 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, |
| 2066 PrerenderFragmentNavigateFragment) { | 2074 MAYBE_PrerenderFragmentNavigateFragment) { |
| 2067 PrerenderTestURL("/prerender/no_prerender_page.html#other_fragment", | 2075 PrerenderTestURL("/prerender/no_prerender_page.html#other_fragment", |
| 2068 FINAL_STATUS_APP_TERMINATING, 1); | 2076 FINAL_STATUS_APP_TERMINATING, 1); |
| 2069 NavigateToURLWithDisposition("/prerender/no_prerender_page.html#fragment", | 2077 NavigateToURLWithDisposition("/prerender/no_prerender_page.html#fragment", |
| 2070 WindowOpenDisposition::CURRENT_TAB, false); | 2078 WindowOpenDisposition::CURRENT_TAB, false); |
| 2071 } | 2079 } |
| 2072 | 2080 |
| 2073 // Checks that we do not use a prerendered page when the page uses a client | 2081 // Checks that we do not use a prerendered page when the page uses a client |
| 2074 // redirect to refresh from a fragment on the same page. | 2082 // redirect to refresh from a fragment on the same page. |
| 2075 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, | 2083 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, |
| 2076 PrerenderClientRedirectFromFragment) { | 2084 PrerenderClientRedirectFromFragment) { |
| (...skipping 1716 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3793 browser()->tab_strip_model()->GetActiveWebContents(); | 3801 browser()->tab_strip_model()->GetActiveWebContents(); |
| 3794 bool display_test_result = false; | 3802 bool display_test_result = false; |
| 3795 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents, | 3803 ASSERT_TRUE(content::ExecuteScriptAndExtractBool(web_contents, |
| 3796 "DidDisplayReallyPass()", | 3804 "DidDisplayReallyPass()", |
| 3797 &display_test_result)); | 3805 &display_test_result)); |
| 3798 ASSERT_TRUE(display_test_result); | 3806 ASSERT_TRUE(display_test_result); |
| 3799 } | 3807 } |
| 3800 #endif // !defined(DISABLE_NACL) | 3808 #endif // !defined(DISABLE_NACL) |
| 3801 | 3809 |
| 3802 } // namespace prerender | 3810 } // namespace prerender |
| OLD | NEW |