summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/test/ui/ppapi_uitest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc
index 25563856..e184e36 100644
--- a/chrome/test/ui/ppapi_uitest.cc
+++ b/chrome/test/ui/ppapi_uitest.cc
@@ -148,7 +148,13 @@ TEST_F(PPAPITest,PaintAggregator) {
RunTestViaHTTP("PaintAggregator");
}
-TEST_F(PPAPITest, Scrollbar) {
+// Fails consistently on Windows. See crbug.com/85010 for details.
+#if defined(OS_WIN)
+#define MAYBE_Scrollbar FAILS_Scrollbar
+#else
+#define MAYBE_Scrollbar Scrollbar
+#endif
+TEST_F(PPAPITest, MAYBE_Scrollbar) {
RunTest("Scrollbar");
}