diff options
| author | eseidel@chromium.org <eseidel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-09 18:18:55 +0000 |
|---|---|---|
| committer | eseidel@chromium.org <eseidel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-09 18:18:55 +0000 |
| commit | d136fc88fb2dc916d7e96c80c65294ad40d03f9f (patch) | |
| tree | 6ba3eed51cfceca824d7ad51776f86087eeb7abe | |
| parent | c4a62d22880760f39f8675ee03e672e2abf1eb0c (diff) | |
| download | chromium_src-d136fc88fb2dc916d7e96c80c65294ad40d03f9f.zip chromium_src-d136fc88fb2dc916d7e96c80c65294ad40d03f9f.tar.gz chromium_src-d136fc88fb2dc916d7e96c80c65294ad40d03f9f.tar.bz2 | |
Merge 263369 "Disable WebViewTest.SpeechRecognition, InputTagSpe..."
> Disable WebViewTest.SpeechRecognition, InputTagSpeechBrowserTest.GrammarAttribute and InputTagSpeechBrowserTest.TestBasicRecognition in order to reland https://codereview.chromium.org/231323003.
>
> TEST=try bots
> R=fsamuel@chromium.org, jschuh@chromium.org
> TBR=tommi
> BUG=360448
>
> Review URL: https://codereview.chromium.org/235423004
TBR=ronghuawu@chromium.org
Review URL: https://codereview.chromium.org/274173002
git-svn-id: svn://svn.chromium.org/chrome/branches/1916/src@269375 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/apps/web_view_browsertest.cc | 3 | ||||
| -rw-r--r-- | content/browser/speech/input_tag_speech_browsertest.cc | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/apps/web_view_browsertest.cc b/chrome/browser/apps/web_view_browsertest.cc index e3afc1f..80cd906 100644 --- a/chrome/browser/apps/web_view_browsertest.cc +++ b/chrome/browser/apps/web_view_browsertest.cc @@ -1679,7 +1679,8 @@ IN_PROC_BROWSER_TEST_F(WebViewTest, ScreenCoordinates) { << message_; } -IN_PROC_BROWSER_TEST_F(WebViewTest, SpeechRecognition) { +// crbug/360448 +IN_PROC_BROWSER_TEST_F(WebViewTest, DISABLED_SpeechRecognition) { ASSERT_TRUE(StartEmbeddedTestServer()); content::WebContents* guest_web_contents = LoadGuest( "/extensions/platform_apps/web_view/speech/guest.html", diff --git a/content/browser/speech/input_tag_speech_browsertest.cc b/content/browser/speech/input_tag_speech_browsertest.cc index 53529c4..cc3bc11 100644 --- a/content/browser/speech/input_tag_speech_browsertest.cc +++ b/content/browser/speech/input_tag_speech_browsertest.cc @@ -105,12 +105,15 @@ SpeechRecognitionManager* // another test here to check that when speech recognition is in progress and // a renderer crashes, we get a call to // SpeechRecognitionManager::CancelAllRequestsWithDelegate. -IN_PROC_BROWSER_TEST_F(InputTagSpeechBrowserTest, TestBasicRecognition) { +// crbug/360448 +IN_PROC_BROWSER_TEST_F(InputTagSpeechBrowserTest, + DISABLED_TestBasicRecognition) { RunSpeechRecognitionTest("basic_recognition.html"); EXPECT_TRUE(fake_speech_recognition_manager_.grammar().empty()); } -IN_PROC_BROWSER_TEST_F(InputTagSpeechBrowserTest, GrammarAttribute) { +// crbug/360448 +IN_PROC_BROWSER_TEST_F(InputTagSpeechBrowserTest, DISABLED_GrammarAttribute) { RunSpeechRecognitionTest("grammar_attribute.html"); EXPECT_EQ("http://example.com/grammar.xml", fake_speech_recognition_manager_.grammar()); |