Index: chrome/test/ppapi/ppapi_browsertest.cc |
diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc |
index bece9c7a068758ed514ddfecf8b153b05efc0a42..b590bfc98f5f63fc8a97ed973bac8a6125f0daa2 100644 |
--- a/chrome/test/ppapi/ppapi_browsertest.cc |
+++ b/chrome/test/ppapi/ppapi_browsertest.cc |
@@ -1067,8 +1067,14 @@ IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, |
LIST_TEST(Audio_AudioCallback4) \ |
) |
+#if defined(OS_LINUX) |
+// http://crbug.com/396464 |
+#define MAYBE_Audio DISABLED_Audio |
+#else |
+#define MAYBE_Audio Audio |
+#endif |
// PPB_Audio is not supported in-process. |
-IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, Audio) { |
+IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_Audio) { |
RUN_AUDIO_SUBTESTS; |
} |
IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, Audio) { |
@@ -1247,8 +1253,9 @@ IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, MAYBE_FlashMessageLoop) { |
#define MAYBE_Compositor0 DISABLED_Compositor0 |
#define MAYBE_Compositor1 DISABLED_Compositor1 |
#else |
-#define MAYBE_Compositor0 Compositor0 |
-#define MAYBE_Compositor1 Compositor1 |
+// flaky on Linux: http://crbug.com/396482 |
+#define MAYBE_Compositor0 DISABLED_Compositor0 |
+#define MAYBE_Compositor1 DISABLED_Compositor1 |
#endif |
TEST_PPAPI_NACL_SUBTESTS(MAYBE_Compositor0, RUN_COMPOSITOR_SUBTESTS_0) |