summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-19 21:00:20 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-19 21:00:20 +0000
commit2243e15bd80f55a10a7d05538edcef4b134441e3 (patch)
treeb12f75b56ddc31ed375835d9238fd759e2f8106a /content
parenta0187c535d483319fddafcc0322e9313707a402f (diff)
downloadchromium_src-2243e15bd80f55a10a7d05538edcef4b134441e3.zip
chromium_src-2243e15bd80f55a10a7d05538edcef4b134441e3.tar.gz
chromium_src-2243e15bd80f55a10a7d05538edcef4b134441e3.tar.bz2
Disable the test SpeechInputBrowserTest.TestCancelAll
It is currently disabled for official builds, but it's flaky on the buildbots, too. BUG=71227 TEST= TBR=satish@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78838 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/speech/speech_input_browsertest.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/content/browser/speech/speech_input_browsertest.cc b/content/browser/speech/speech_input_browsertest.cc
index 07610ba..83ae2b4 100644
--- a/content/browser/speech/speech_input_browsertest.cc
+++ b/content/browser/speech/speech_input_browsertest.cc
@@ -222,12 +222,7 @@ IN_PROC_BROWSER_TEST_F(SpeechInputBrowserTest, MAYBE_GrammarAttribute) {
}
// Marked as DISABLED due to http://crbug.com/71227
-#if defined(GOOGLE_CHROME_BUILD)
-#define MAYBE_TestCancelAll DISABLED_TestCancelAll
-#else
-#define MAYBE_TestCancelAll TestCancelAll
-#endif
-IN_PROC_BROWSER_TEST_F(SpeechInputBrowserTest, MAYBE_TestCancelAll) {
+IN_PROC_BROWSER_TEST_F(SpeechInputBrowserTest, DISABLED_TestCancelAll) {
// The test checks that the cancel-all callback gets issued when a session
// is pending, so don't send a fake response.
fake_speech_input_manager_.set_send_fake_response(false);