Index: chrome/test/ui/ppapi_uitest.cc |
diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc |
index dafdcaae23a7f8066c7efe9d3884f095c93ab1e6..4284ceada76f3b7598736c09c7db0c233a2e602f 100644 |
--- a/chrome/test/ui/ppapi_uitest.cc |
+++ b/chrome/test/ui/ppapi_uitest.cc |
@@ -6,6 +6,7 @@ |
#include "base/path_service.h" |
#include "base/test/test_timeouts.h" |
#include "build/build_config.h" |
+#include "content/common/content_switches.h" |
#include "chrome/common/chrome_switches.h" |
#include "chrome/test/automation/tab_proxy.h" |
#include "chrome/test/ui/ui_test.h" |
@@ -55,6 +56,12 @@ class PPAPITest : public UITest { |
// TODO(dumi): remove this switch once we have a quota management |
// system in place. |
launch_arguments_.AppendSwitch(switches::kUnlimitedQuotaForFiles); |
+ |
+#if defined(OS_MACOSX) |
+ // Smooth scrolling confuses the scrollbar test. |
+ launch_arguments_.AppendSwitch( |
+ switches::kDisableMacSmoothScrollingForTesting); |
+#endif |
} |
void RunTest(const std::string& test_case) { |