summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-17 04:40:11 +0000
committereroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-17 04:40:11 +0000
commitcabb7642f5606ea8877b0c7bc26b94a0692b7731 (patch)
tree4194881c5eac71e511b081fca6609dc24b7d7df6
parent3f1084c1212f8f035cd9a4452f4f8357be7ef71a (diff)
downloadchromium_src-cabb7642f5606ea8877b0c7bc26b94a0692b7731.zip
chromium_src-cabb7642f5606ea8877b0c7bc26b94a0692b7731.tar.gz
chromium_src-cabb7642f5606ea8877b0c7bc26b94a0692b7731.tar.bz2
Disable OmniboxApiTest.Basic on ChromiumOS.
BUG=114721 TBR=creis Review URL: https://chromiumcodereview.appspot.com/9413037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122457 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/extensions/extension_omnibox_apitest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_omnibox_apitest.cc b/chrome/browser/extensions/extension_omnibox_apitest.cc
index 600f81c..e52feec 100644
--- a/chrome/browser/extensions/extension_omnibox_apitest.cc
+++ b/chrome/browser/extensions/extension_omnibox_apitest.cc
@@ -78,9 +78,9 @@ class OmniboxApiTest : public ExtensionApiTest {
}
};
-#if defined(OS_CHROMEOS) && !defined(USE_AURA)
-// The test fails on chromeos gtk bot, although it passes locally.
-// crbug.com/113455.
+#if defined(OS_CHROMEOS)
+// The test fails on chromeos gtk bot, and linux chromeos aura although it
+// passes locally. crbug.com/113455 and crbug.com/114721
#define MAYBE_Basic DISABLED_Basic
#else
#define MAYBE_Basic Basic