Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(96)

Side by Side Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 11664013: GTTF: No more FLAKY_ . (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 1332 matching lines...) Expand 10 before | Expand all | Expand 10 after
1343 1); 1343 1);
1344 } 1344 }
1345 1345
1346 // Checks that plugins are not loaded while a page is being preloaded, but 1346 // Checks that plugins are not loaded while a page is being preloaded, but
1347 // are loaded when the page is displayed. 1347 // are loaded when the page is displayed.
1348 #if defined(USE_AURA) 1348 #if defined(USE_AURA)
1349 // http://crbug.com/103496 1349 // http://crbug.com/103496
1350 #define MAYBE_PrerenderDelayLoadPlugin DISABLED_PrerenderDelayLoadPlugin 1350 #define MAYBE_PrerenderDelayLoadPlugin DISABLED_PrerenderDelayLoadPlugin
1351 #elif defined(OS_MACOSX) 1351 #elif defined(OS_MACOSX)
1352 // http://crbug.com/100514 1352 // http://crbug.com/100514
1353 #define MAYBE_PrerenderDelayLoadPlugin FLAKY_PrerenderDelayLoadPlugin 1353 #define MAYBE_PrerenderDelayLoadPlugin DISABLED_PrerenderDelayLoadPlugin
1354 #else 1354 #else
1355 #define MAYBE_PrerenderDelayLoadPlugin PrerenderDelayLoadPlugin 1355 #define MAYBE_PrerenderDelayLoadPlugin PrerenderDelayLoadPlugin
1356 #endif 1356 #endif
1357 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, MAYBE_PrerenderDelayLoadPlugin) { 1357 IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, MAYBE_PrerenderDelayLoadPlugin) {
1358 PrerenderTestURL("files/prerender/plugin_delay_load.html", 1358 PrerenderTestURL("files/prerender/plugin_delay_load.html",
1359 FINAL_STATUS_USED, 1359 FINAL_STATUS_USED,
1360 1); 1360 1);
1361 NavigateToDestURL(); 1361 NavigateToDestURL();
1362 } 1362 }
1363 1363
(...skipping 1281 matching lines...) Expand 10 before | Expand all | Expand 10 after
2645 channel_close_watcher.WatchChannel( 2645 channel_close_watcher.WatchChannel(
2646 chrome::GetActiveWebContents(browser())->GetRenderProcessHost()); 2646 chrome::GetActiveWebContents(browser())->GetRenderProcessHost());
2647 NavigateToDestURL(); 2647 NavigateToDestURL();
2648 channel_close_watcher.WaitForChannelClose(); 2648 channel_close_watcher.WaitForChannelClose();
2649 2649
2650 ASSERT_TRUE(IsEmptyPrerenderLinkManager()); 2650 ASSERT_TRUE(IsEmptyPrerenderLinkManager());
2651 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); 2651 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
2652 } 2652 }
2653 2653
2654 } // namespace prerender 2654 } // namespace prerender
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698