| Index: ui/aura_shell/test_suite.cc
|
| diff --git a/ui/aura_shell/test_suite.cc b/ui/aura_shell/test_suite.cc
|
| index d1168b9feae52d47109786448d14cddba288e600..3c1eab99b9c0168ddb6ee681cc5b5f2a2509771d 100644
|
| --- a/ui/aura_shell/test_suite.cc
|
| +++ b/ui/aura_shell/test_suite.cc
|
| @@ -11,7 +11,12 @@
|
| #include "ui/base/ui_base_paths.h"
|
| #include "ui/gfx/compositor/test/compositor_test_support.h"
|
| #include "ui/gfx/gfx_paths.h"
|
| +
|
| +#if defined(USE_WEBKIT_COMPOSITOR)
|
| +#include "ui/gfx/compositor/compositor_setup.h"
|
| +#else
|
| #include "ui/gfx/test/gfx_test_utils.h"
|
| +#endif
|
|
|
| namespace aura_shell {
|
| namespace test {
|
| @@ -29,7 +34,11 @@ void AuraShellTestSuite::Initialize() {
|
| // output, it'll pass regardless of the system language.
|
| ui::ResourceBundle::InitSharedInstance("en-US");
|
| ui::CompositorTestSupport::Initialize();
|
| +#if defined(USE_WEBKIT_COMPOSITOR)
|
| + ui::SetupTestCompositor();
|
| +#else
|
| ui::gfx_test_utils::SetupTestCompositor();
|
| +#endif
|
| }
|
|
|
| void AuraShellTestSuite::Shutdown() {
|
|
|