diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-16 20:54:55 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-16 20:54:55 +0000 |
| commit | 904149262b7e6f3bd035f2a6a7fda88bdd01f9e4 (patch) | |
| tree | 29152d34ae043d78f9a58a96504b86f7a9c13381 | |
| parent | 2af666c774ef1302235f595ff5de56021cc8e355 (diff) | |
| download | chromium_src-904149262b7e6f3bd035f2a6a7fda88bdd01f9e4.zip chromium_src-904149262b7e6f3bd035f2a6a7fda88bdd01f9e4.tar.gz chromium_src-904149262b7e6f3bd035f2a6a7fda88bdd01f9e4.tar.bz2 | |
mac: Make two tests as FAILS_ that fail on the trybots.
BUG=100514
TEST=none
TBR=mmenke
Review URL: http://codereview.chromium.org/8315008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105741 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/prerender/prerender_browsertest.cc | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index d13f82c..84c0471 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_browsertest.cc @@ -860,7 +860,13 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderAlertAfterOnload) { // Checks that plugins are not loaded while a page is being preloaded, but // are loaded when the page is displayed. -IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderDelayLoadPlugin) { +#if defined(OS_MACOSX) +// http://crbug.com/100514 +#define MAYBE_PrerenderDelayLoadPlugin FAILS_PrerenderDelayLoadPlugin +#else +#define MAYBE_PrerenderDelayLoadPlugin PrerenderDelayLoadPlugin +#endif +IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, MAYBE_PrerenderDelayLoadPlugin) { PrerenderTestURL("files/prerender/plugin_delay_load.html", FINAL_STATUS_USED, 1); @@ -882,7 +888,15 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClickToPlay) { // Checks that plugins in an iframe are not loaded while a page is // being preloaded, but are loaded when the page is displayed. -IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderIframeDelayLoadPlugin) { +#if defined(OS_MACOSX) +// http://crbug.com/100514 +#define MAYBE_PrerenderIframeDelayLoadPlugin \ + FAILS_PrerenderIframeDelayLoadPlugin +#else +#define MAYBE_PrerenderIframeDelayLoadPlugin PrerenderIframeDelayLoadPlugin +#endif +IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, + MAYBE_PrerenderIframeDelayLoadPlugin) { PrerenderTestURL("files/prerender/prerender_iframe_plugin_delay_load.html", FINAL_STATUS_USED, 1); |