diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 23:56:31 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 23:56:31 +0000 |
| commit | 973d44a198f2fa9314ecbe43b06f0a7d622dfc7e (patch) | |
| tree | 4065dfa54da57bfc46f7f7fbcbd13001a31eafb6 /ui/aura_shell/test_suite.cc | |
| parent | 023caca1556db34fef0b98bb484b39c653758755 (diff) | |
| download | chromium_src-973d44a198f2fa9314ecbe43b06f0a7d622dfc7e.zip chromium_src-973d44a198f2fa9314ecbe43b06f0a7d622dfc7e.tar.gz chromium_src-973d44a198f2fa9314ecbe43b06f0a7d622dfc7e.tar.bz2 | |
Revert 113470 - 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.
BUG=104360
TEST=none
Review URL: http://codereview.chromium.org/8805033
TBR=sky@chromium.org
Review URL: http://codereview.chromium.org/8873001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113507 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell/test_suite.cc')
| -rw-r--r-- | ui/aura_shell/test_suite.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/ui/aura_shell/test_suite.cc b/ui/aura_shell/test_suite.cc index 3c1eab9..d1168b9 100644 --- a/ui/aura_shell/test_suite.cc +++ b/ui/aura_shell/test_suite.cc @@ -11,12 +11,7 @@ #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 { @@ -34,11 +29,7 @@ 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() { |