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 1272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1283 | 1283 |
1284 // Checks that plugins in an iframe are not loaded while a page is | 1284 // Checks that plugins in an iframe are not loaded while a page is |
1285 // being preloaded, but are loaded when the page is displayed. | 1285 // being preloaded, but are loaded when the page is displayed. |
1286 #if defined(USE_AURA) | 1286 #if defined(USE_AURA) |
1287 // http://crbug.com/103496 | 1287 // http://crbug.com/103496 |
1288 #define MAYBE_PrerenderIframeDelayLoadPlugin \ | 1288 #define MAYBE_PrerenderIframeDelayLoadPlugin \ |
1289 DISABLED_PrerenderIframeDelayLoadPlugin | 1289 DISABLED_PrerenderIframeDelayLoadPlugin |
1290 #elif defined(OS_MACOSX) | 1290 #elif defined(OS_MACOSX) |
1291 // http://crbug.com/100514 | 1291 // http://crbug.com/100514 |
1292 #define MAYBE_PrerenderIframeDelayLoadPlugin \ | 1292 #define MAYBE_PrerenderIframeDelayLoadPlugin \ |
1293 FAILS_PrerenderIframeDelayLoadPlugin | 1293 DISABLED_PrerenderIframeDelayLoadPlugin |
1294 #else | 1294 #else |
1295 #define MAYBE_PrerenderIframeDelayLoadPlugin PrerenderIframeDelayLoadPlugin | 1295 #define MAYBE_PrerenderIframeDelayLoadPlugin PrerenderIframeDelayLoadPlugin |
1296 #endif | 1296 #endif |
1297 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, | 1297 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, |
1298 MAYBE_PrerenderIframeDelayLoadPlugin) { | 1298 MAYBE_PrerenderIframeDelayLoadPlugin) { |
1299 PrerenderTestURL("files/prerender/prerender_iframe_plugin_delay_load.html", | 1299 PrerenderTestURL("files/prerender/prerender_iframe_plugin_delay_load.html", |
1300 FINAL_STATUS_USED, | 1300 FINAL_STATUS_USED, |
1301 1); | 1301 1); |
1302 NavigateToDestURL(); | 1302 NavigateToDestURL(); |
1303 } | 1303 } |
(...skipping 1215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2519 channel_close_watcher.WatchChannel( | 2519 channel_close_watcher.WatchChannel( |
2520 chrome::GetActiveWebContents(browser())->GetRenderProcessHost()); | 2520 chrome::GetActiveWebContents(browser())->GetRenderProcessHost()); |
2521 NavigateToDestURL(); | 2521 NavigateToDestURL(); |
2522 channel_close_watcher.WaitForChannelClose(); | 2522 channel_close_watcher.WaitForChannelClose(); |
2523 | 2523 |
2524 ASSERT_TRUE(IsEmptyPrerenderLinkManager()); | 2524 ASSERT_TRUE(IsEmptyPrerenderLinkManager()); |
2525 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 2525 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
2526 } | 2526 } |
2527 | 2527 |
2528 } // namespace prerender | 2528 } // namespace prerender |
OLD | NEW |