Index: chrome/test/base/interactive_ui_tests_main.cc |
diff --git a/chrome/test/base/interactive_ui_tests_main.cc b/chrome/test/base/interactive_ui_tests_main.cc |
index b84939fc25c5c558f7ee7c0b94b25d2d11c205c5..c2491cf2b4ce2e4aed80ac1a6be0d72fee3799b2 100644 |
--- a/chrome/test/base/interactive_ui_tests_main.cc |
+++ b/chrome/test/base/interactive_ui_tests_main.cc |
@@ -8,6 +8,7 @@ |
#include "chrome/test/base/chrome_test_suite.h" |
#include "chrome/test/base/in_process_browser_test.h" |
#include "chrome/test/base/interactive_test_utils.h" |
+#include "gpu/ipc/service/image_transport_surface.h" |
#include "ui/base/test/ui_controls.h" |
#if defined(USE_AURA) |
@@ -37,6 +38,10 @@ class InteractiveUITestSuite : public ChromeTestSuite { |
void Initialize() override { |
ChromeTestSuite::Initialize(); |
+#if defined(OS_MACOSX) |
+ gpu::ImageTransportSurface::SetAllowOSMesaForTesting(true); |
+#endif |
+ |
// Only allow ui_controls to be used in interactive_ui_tests, since they |
// depend on focus and can't be sharded. |
ui_controls::EnableUIControls(); |