diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-09 16:19:03 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-09 16:19:03 +0000 |
| commit | 72f08de6e66e8be7111eedab407f80e2ae2d9ae0 (patch) | |
| tree | 4072644471f259cfecc678f8297c3ba6adf2724d /ui/views/run_all_unittests.cc | |
| parent | 51d83bdfd5c71099465fba1ae1abb684db6662e3 (diff) | |
| download | chromium_src-72f08de6e66e8be7111eedab407f80e2ae2d9ae0.zip chromium_src-72f08de6e66e8be7111eedab407f80e2ae2d9ae0.tar.gz chromium_src-72f08de6e66e8be7111eedab407f80e2ae2d9ae0.tar.bz2 | |
Attempt 3 at:
Makes tests either use mock compositor or mock
WebGraphicsContext3D depending upon which compositor we're
running. This is needed to enable ui tests on the bots.
Attempt 2 failed because of last minute changes to chrome_tests.gypi
that I didn't merge properly with. TBRing again.
BUG=104360
TEST=none
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/8890050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113809 0039d316-1c4b-4281-b951-d872f2087c98
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() { |