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 <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/string_util.h" | 9 #include "base/string_util.h" |
10 #include "base/stringprintf.h" | 10 #include "base/stringprintf.h" |
(...skipping 2251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2262 // in a prerendered page. | 2262 // in a prerendered page. |
2263 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSessionStorage) { | 2263 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderSessionStorage) { |
2264 set_loader_path("files/prerender/prerender_loader_with_session_storage.html"); | 2264 set_loader_path("files/prerender/prerender_loader_with_session_storage.html"); |
2265 PrerenderTestURL(GetCrossDomainTestUrl("files/prerender/prerender_page.html"), | 2265 PrerenderTestURL(GetCrossDomainTestUrl("files/prerender/prerender_page.html"), |
2266 FINAL_STATUS_USED, | 2266 FINAL_STATUS_USED, |
2267 1); | 2267 1); |
2268 NavigateToDestURL(); | 2268 NavigateToDestURL(); |
2269 GoBackToPageBeforePrerender(); | 2269 GoBackToPageBeforePrerender(); |
2270 } | 2270 } |
2271 | 2271 |
| 2272 #if defined(OS_MACOSX) |
| 2273 // http://crbug.com/142535 - Times out on Chrome Mac release builder |
| 2274 #define MAYBE_ControlGroup DISABLED_ControlGroup |
| 2275 #else |
| 2276 #define MAYBE_ControlGroup ControlGroup |
| 2277 #endif |
2272 // Checks that the control group works. A JS alert cannot be detected in the | 2278 // Checks that the control group works. A JS alert cannot be detected in the |
2273 // control group. | 2279 // control group. |
2274 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, ControlGroup) { | 2280 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, MAYBE_ControlGroup) { |
2275 RestorePrerenderMode restore_prerender_mode; | 2281 RestorePrerenderMode restore_prerender_mode; |
2276 PrerenderManager::SetMode( | 2282 PrerenderManager::SetMode( |
2277 PrerenderManager::PRERENDER_MODE_EXPERIMENT_CONTROL_GROUP); | 2283 PrerenderManager::PRERENDER_MODE_EXPERIMENT_CONTROL_GROUP); |
2278 PrerenderTestURL("files/prerender/prerender_alert_before_onload.html", | 2284 PrerenderTestURL("files/prerender/prerender_alert_before_onload.html", |
2279 FINAL_STATUS_WOULD_HAVE_BEEN_USED, 0); | 2285 FINAL_STATUS_WOULD_HAVE_BEEN_USED, 0); |
2280 NavigateToDestURL(); | 2286 NavigateToDestURL(); |
2281 } | 2287 } |
2282 | 2288 |
2283 // Make sure that the MatchComplete dummy works in the normal case. Once | 2289 // Make sure that the MatchComplete dummy works in the normal case. Once |
2284 // a prerender is cancelled because of a script, a dummy must be created to | 2290 // a prerender is cancelled because of a script, a dummy must be created to |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2386 ResultCatcher catcher; | 2392 ResultCatcher catcher; |
2387 | 2393 |
2388 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); | 2394 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); |
2389 NavigateToDestURL(); | 2395 NavigateToDestURL(); |
2390 ASSERT_TRUE(IsEmptyPrerenderLinkManager()); | 2396 ASSERT_TRUE(IsEmptyPrerenderLinkManager()); |
2391 | 2397 |
2392 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 2398 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
2393 } | 2399 } |
2394 | 2400 |
2395 } // namespace prerender | 2401 } // namespace prerender |
OLD | NEW |