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 1122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1133 PrerenderTestURL("files/prerender/prerender_alert_after_onload.html", | 1133 PrerenderTestURL("files/prerender/prerender_alert_after_onload.html", |
1134 FINAL_STATUS_JAVASCRIPT_ALERT, | 1134 FINAL_STATUS_JAVASCRIPT_ALERT, |
1135 1); | 1135 1); |
1136 } | 1136 } |
1137 | 1137 |
1138 // Checks that plugins are not loaded while a page is being preloaded, but | 1138 // Checks that plugins are not loaded while a page is being preloaded, but |
1139 // are loaded when the page is displayed. | 1139 // are loaded when the page is displayed. |
1140 #if defined(USE_AURA) | 1140 #if defined(USE_AURA) |
1141 // http://crbug.com/103496 | 1141 // http://crbug.com/103496 |
1142 #define MAYBE_PrerenderDelayLoadPlugin DISABLED_PrerenderDelayLoadPlugin | 1142 #define MAYBE_PrerenderDelayLoadPlugin DISABLED_PrerenderDelayLoadPlugin |
| 1143 #elif defined(OS_MACOSX) |
| 1144 // http://crbug.com/100514 |
| 1145 #define MAYBE_PrerenderDelayLoadPlugin FLAKY_PrerenderDelayLoadPlugin |
1143 #else | 1146 #else |
1144 #define MAYBE_PrerenderDelayLoadPlugin PrerenderDelayLoadPlugin | 1147 #define MAYBE_PrerenderDelayLoadPlugin PrerenderDelayLoadPlugin |
1145 #endif | 1148 #endif |
1146 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, MAYBE_PrerenderDelayLoadPlugin) { | 1149 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, MAYBE_PrerenderDelayLoadPlugin) { |
1147 PrerenderTestURL("files/prerender/plugin_delay_load.html", | 1150 PrerenderTestURL("files/prerender/plugin_delay_load.html", |
1148 FINAL_STATUS_USED, | 1151 FINAL_STATUS_USED, |
1149 1); | 1152 1); |
1150 NavigateToDestURL(); | 1153 NavigateToDestURL(); |
1151 } | 1154 } |
1152 | 1155 |
(...skipping 1230 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2383 ResultCatcher catcher; | 2386 ResultCatcher catcher; |
2384 | 2387 |
2385 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); | 2388 PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); |
2386 NavigateToDestURL(); | 2389 NavigateToDestURL(); |
2387 ASSERT_TRUE(IsEmptyPrerenderLinkManager()); | 2390 ASSERT_TRUE(IsEmptyPrerenderLinkManager()); |
2388 | 2391 |
2389 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 2392 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
2390 } | 2393 } |
2391 | 2394 |
2392 } // namespace prerender | 2395 } // namespace prerender |
OLD | NEW |