diff options
Diffstat (limited to 'ui/aura/test/test_suite.cc')
| -rw-r--r-- | ui/aura/test/test_suite.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/ui/aura/test/test_suite.cc b/ui/aura/test/test_suite.cc index bbf3428..8fb8d2e 100644 --- a/ui/aura/test/test_suite.cc +++ b/ui/aura/test/test_suite.cc @@ -12,7 +12,12 @@ #include "ui/gfx/compositor/test/compositor_test_support.h" #include "ui/gfx/gfx_paths.h" #include "ui/gfx/gl/gl_implementation.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 { namespace test { @@ -30,7 +35,12 @@ void AuraTestSuite::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 AuraTestSuite::Shutdown() { |