| Index: ui/aura_shell/test_suite.cc
|
| diff --git a/ui/aura_shell/test_suite.cc b/ui/aura_shell/test_suite.cc
|
| index 5ccb18ffba78e7fc8150887cfb38ed529a98a0ef..07fcddce3a3b366a7a5a1eaf1eed92c27693db4f 100644
|
| --- a/ui/aura_shell/test_suite.cc
|
| +++ b/ui/aura_shell/test_suite.cc
|
| @@ -11,15 +11,11 @@
|
| #include "ui/base/ui_base_paths.h"
|
| #include "ui/gfx/compositor/compositor_test_support.h"
|
| #include "ui/gfx/gfx_paths.h"
|
| -#include "ui/gfx/gl/gl_implementation.h"
|
|
|
| AuraShellTestSuite::AuraShellTestSuite(int argc, char** argv)
|
| : TestSuite(argc, argv) {}
|
|
|
| void AuraShellTestSuite::Initialize() {
|
| -#if defined(OS_LINUX)
|
| - gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL);
|
| -#endif
|
| base::TestSuite::Initialize();
|
|
|
| gfx::RegisterPathProvider();
|
| @@ -29,6 +25,7 @@ void AuraShellTestSuite::Initialize() {
|
| // output, it'll pass regardless of the system language.
|
| ui::ResourceBundle::InitSharedInstance("en-US");
|
| ui::CompositorTestSupport::Initialize();
|
| + ui::CompositorTestSupport::SetupMockCompositor();
|
| }
|
|
|
| void AuraShellTestSuite::Shutdown() {
|
|
|