diff options
Diffstat (limited to 'ui/aura_shell/test_suite.cc')
| -rw-r--r-- | ui/aura_shell/test_suite.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ui/aura_shell/test_suite.cc b/ui/aura_shell/test_suite.cc index d1168b9..3c1eab9 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() { |