diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 20:30:47 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-23 20:30:47 +0000 |
| commit | e8c7581be58121cea28a4df050811da7a03e3c8f (patch) | |
| tree | 4ce277b2183db8f14a2f6428a011d0589300a2b0 /chrome/common | |
| parent | cb114f14b97f51eb35991e98f4483a944ef1c323 (diff) | |
| download | chromium_src-e8c7581be58121cea28a4df050811da7a03e3c8f.zip chromium_src-e8c7581be58121cea28a4df050811da7a03e3c8f.tar.gz chromium_src-e8c7581be58121cea28a4df050811da7a03e3c8f.tar.bz2 | |
Build & run unit tests on Aura (Rebase)
Applied patch from http://codereview.chromium.org/8665006/
BUG=none
TEST=duh
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/8677014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111403 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/service_process_util_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/common/service_process_util_unittest.cc b/chrome/common/service_process_util_unittest.cc index 071b90d..28ffb74 100644 --- a/chrome/common/service_process_util_unittest.cc +++ b/chrome/common/service_process_util_unittest.cc @@ -31,7 +31,7 @@ #include <glib.h> #endif -#if defined(TOUCH_UI) +#if defined(USE_AURA) // This test fails http://crbug.com/84854, and is very flaky on CrOS and // somewhat flaky on other Linux. #define MAYBE_ForceShutdown FAILS_ForceShutdown |