diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-08 22:27:21 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-08 22:27:21 +0000 |
| commit | 207ff6675717b341d3c78d305762cd6d7a9888e1 (patch) | |
| tree | be0cd36338515ddc69935e6f2966f59b181d08aa /chrome/test/ui/ui_test.cc | |
| parent | afaf073bb190f4e3becd8e1cd60dde6324f7ae15 (diff) | |
| download | chromium_src-207ff6675717b341d3c78d305762cd6d7a9888e1.zip chromium_src-207ff6675717b341d3c78d305762cd6d7a9888e1.tar.gz chromium_src-207ff6675717b341d3c78d305762cd6d7a9888e1.tar.bz2 | |
Attempt 2 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.
I reverted first attempt as it broke some browser_tests. I've
straightened that out in another patch, so this should be good go
again. TBR since it's the same patch as before.
BUG=104360
TEST=none
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/8889022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113676 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui/ui_test.cc')
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 7f1fe05a..29a1b46 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -56,6 +56,9 @@ #include "base/win/windows_version.h" #endif +#if defined(USE_AURA) +#include "ui/gfx/compositor/compositor_switches.h" +#endif using base::Time; using base::TimeDelta; @@ -199,6 +202,12 @@ void UITestBase::SetLaunchSwitches() { launch_arguments_.AppendSwitchASCII(switches::kHomePage, homepage_); if (!test_name_.empty()) launch_arguments_.AppendSwitchASCII(switches::kTestName, test_name_); +#if defined(USE_AURA) + if (!CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisableTestCompositor)) { + launch_arguments_.AppendSwitch(switches::kTestCompositor); + } +#endif } void UITestBase::SetUpProfile() { |