Commit 6febec33 authored by mnissler@chromium.org's avatar mnissler@chromium.org

Disable SpeechRecognitionBrowserTest.TestCancelAll on Windows and Linux.

It fails flakily.

BUG=chromium:140765
TBR=satish@chromium.org, hans@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10824179

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150083 0039d316-1c4b-4281-b951-d872f2087c98
parent 0c49a425
...@@ -28,10 +28,10 @@ ...@@ -28,10 +28,10 @@
#include "content/test/content_browser_test_utils.h" #include "content/test/content_browser_test_utils.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
using content::NavigationController;
using content::SpeechRecognitionEventListener; using content::SpeechRecognitionEventListener;
using content::SpeechRecognitionSessionConfig; using content::SpeechRecognitionSessionConfig;
using content::SpeechRecognitionSessionContext; using content::SpeechRecognitionSessionContext;
using content::NavigationController;
using content::WebContents; using content::WebContents;
namespace speech { namespace speech {
...@@ -276,7 +276,13 @@ IN_PROC_BROWSER_TEST_F(SpeechRecognitionBrowserTest, GrammarAttribute) { ...@@ -276,7 +276,13 @@ IN_PROC_BROWSER_TEST_F(SpeechRecognitionBrowserTest, GrammarAttribute) {
fake_speech_recognition_manager_.grammar()); 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 // The test checks that the cancel-all callback gets issued when a session
// is pending, so don't send a fake response. // is pending, so don't send a fake response.
// We are not expecting a navigation event being raised from the JS of the // We are not expecting a navigation event being raised from the JS of the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment