diff options
| author | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-14 19:39:47 +0000 |
|---|---|---|
| committer | saintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-14 19:39:47 +0000 |
| commit | b9d50766cae3153a2e24b620e7ab0e4ddbf66a14 (patch) | |
| tree | 7e638fa07c042b82e5e5284ccb4d4c8e80e2d71f /chrome/browser/ui/omnibox | |
| parent | 4502e649c49c0695dbf86341fa134aa76466996f (diff) | |
| download | chromium_src-b9d50766cae3153a2e24b620e7ab0e4ddbf66a14.zip chromium_src-b9d50766cae3153a2e24b620e7ab0e4ddbf66a14.tar.gz chromium_src-b9d50766cae3153a2e24b620e7ab0e4ddbf66a14.tar.bz2 | |
OmniboxViewTest.PopupAccelerators had to be disabled for Aura so that we can enable the intyeractive_ui_tests in the main Waterfall
TBR=oshima@chromium.org
BUG=107588
TEST=none
Review URL: http://codereview.chromium.org/8915011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114477 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/omnibox')
| -rw-r--r-- | chrome/browser/ui/omnibox/omnibox_view_browsertest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc index 6f2ecf1..22f104b 100644 --- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc +++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc @@ -1131,7 +1131,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, FLAKY_BrowserAccelerators) { } // Flakily fails and times out on Win only. http://crbug.com/69941 -#if defined(OS_WIN) +#if defined(OS_WIN) || defined(USE_AURA) #define MAYBE_PopupAccelerators DISABLED_PopupAccelerators #else #define MAYBE_PopupAccelerators PopupAccelerators |