diff options
Diffstat (limited to 'chrome/test/ui/npapi_uitest.cc')
| -rw-r--r-- | chrome/test/ui/npapi_uitest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/test/ui/npapi_uitest.cc b/chrome/test/ui/npapi_uitest.cc index c6f4a71..2d8fe1a 100644 --- a/chrome/test/ui/npapi_uitest.cc +++ b/chrome/test/ui/npapi_uitest.cc @@ -93,7 +93,13 @@ TEST_F(NPAPITester, FLAKY_GetJavaScriptURL2) { // Tests that if an NPObject is proxies back to its original process, the // original pointer is returned and not a proxy. If this fails the plugin // will crash. -TEST_F(NPAPITester, NPObjectProxy) { +#if defined(OS_MACOSX) +// http://crbug.com/42086 - fails on 10.6 most of the time +#define MAYBE_NPObjectProxy FLAKY_NPObjectProxy +#else +#define MAYBE_NPObjectProxy NPObjectProxy +#endif +TEST_F(NPAPITester, MAYBE_NPObjectProxy) { const FilePath test_case(FILE_PATH_LITERAL("npobject_proxy.html")); GURL url = ui_test_utils::GetTestUrl(FilePath(kTestDir), test_case); ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); |