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

Unified Diff: content/browser/media/webrtc_browsertest.cc

Issue 15688006: Made sure empty-call-then-add-one-stream test doesn't do simultaneous negotiations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Will now not allow simultaneous negotiations. Created 7 years, 7 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
Index: content/browser/media/webrtc_browsertest.cc
diff --git a/content/browser/media/webrtc_browsertest.cc b/content/browser/media/webrtc_browsertest.cc
index fcd6ad8e8531da65737c177acd00320477cc0e63..cfff360bf01101215b39f1a89ed41ae29153a42f 100644
--- a/content/browser/media/webrtc_browsertest.cc
+++ b/content/browser/media/webrtc_browsertest.cc
@@ -114,15 +114,13 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MANUAL_CanSetupCallAndSendDtmf) {
ExecuteJavascript("callAndSendDtmf('123,abc');"));
}
-// TODO(miu): Test is flaky. http://crbug.com/236102
IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
- DISABLED_CanMakeEmptyCallThenAddStreamsAndRenegotiate) {
+ CanMakeEmptyCallThenAddStreamsAndRenegotiate) {
GURL url(test_server()->GetURL("files/media/peerconnection-call.html"));
NavigateToURL(shell(), url);
const char* kJavascript =
- "makeEmptyCallThenAddOneStreamAndRenegotiate("
- "{video: true, audio: true});";
+ "callEmptyThenAddOneStreamAndRenegotiate({video: true, audio: true});";
EXPECT_TRUE(ExecuteJavascript(kJavascript));
ExpectTitle("OK");
}
« no previous file with comments | « no previous file | content/test/data/media/peerconnection-call.html » ('j') | content/test/data/media/peerconnection-call.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698