From b9d50766cae3153a2e24b620e7ab0e4ddbf66a14 Mon Sep 17 00:00:00 2001 From: "saintlou@chromium.org" Date: Wed, 14 Dec 2011 19:39:47 +0000 Subject: 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 --- chrome/browser/ui/omnibox/omnibox_view_browsertest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.1