Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1381)

Unified Diff: content/browser/speech/speech_recognition_browsertest.cc

Issue 10824179: Disable SpeechRecognitionBrowserTest.TestCancelAll on Windows and Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/speech/speech_recognition_browsertest.cc
diff --git a/content/browser/speech/speech_recognition_browsertest.cc b/content/browser/speech/speech_recognition_browsertest.cc
index 14972017fdad9864cdbee555723de99a0ac966d0..35498db4454ee06667142e9858cd561d12f98d22 100644
--- a/content/browser/speech/speech_recognition_browsertest.cc
+++ b/content/browser/speech/speech_recognition_browsertest.cc
@@ -28,10 +28,10 @@
#include "content/test/content_browser_test_utils.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
+using content::NavigationController;
using content::SpeechRecognitionEventListener;
using content::SpeechRecognitionSessionConfig;
using content::SpeechRecognitionSessionContext;
-using content::NavigationController;
using content::WebContents;
namespace speech {
@@ -276,7 +276,13 @@ IN_PROC_BROWSER_TEST_F(SpeechRecognitionBrowserTest, GrammarAttribute) {
fake_speech_recognition_manager_.grammar());
}
-IN_PROC_BROWSER_TEST_F(SpeechRecognitionBrowserTest, TestCancelAll) {
+// Flaky on Linux and Windows, http://crbug.com/140765.
+#if defined(OS_WIN) || defined(OS_LINUX)
+#define MAYBE_TestCancelAll DISABLED_TestCancelAll
+#else
+#define MAYBE_TestCancelAll TestCancelAll
+#endif
+IN_PROC_BROWSER_TEST_F(SpeechRecognitionBrowserTest, MAYBE_TestCancelAll) {
// The test checks that the cancel-all callback gets issued when a session
// is pending, so don't send a fake response.
// We are not expecting a navigation event being raised from the JS of the
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698