diff options
Diffstat (limited to 'ui/views/run_all_unittests.cc')
| -rw-r--r-- | ui/views/run_all_unittests.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/ui/views/run_all_unittests.cc b/ui/views/run_all_unittests.cc index e675291..9273994 100644 --- a/ui/views/run_all_unittests.cc +++ b/ui/views/run_all_unittests.cc @@ -6,9 +6,14 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" #include "ui/gfx/compositor/test/compositor_test_support.h" -#include "ui/gfx/test/gfx_test_utils.h" #include "ui/views/view.h" +#if defined(USE_WEBKIT_COMPOSITOR) +#include "ui/gfx/compositor/compositor_setup.h" +#else +#include "ui/gfx/test/gfx_test_utils.h" +#endif + class ViewTestSuite : public base::TestSuite { public: ViewTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {} @@ -21,7 +26,11 @@ class ViewTestSuite : public base::TestSuite { ui::ResourceBundle::InitSharedInstance("en-US"); ui::CompositorTestSupport::Initialize(); +#if defined(USE_WEBKIT_COMPOSITOR) + ui::SetupTestCompositor(); +#else ui::gfx_test_utils::SetupTestCompositor(); +#endif } virtual void Shutdown() { |