Made sure empty-call-then-add-one-stream test doesn't do simultaneous negotiations.

Made sure empty-call-then-add-one-stream test doesn't do simultaneous negotiations.

This should solve the flakiness we've been seeing.

BUG=236102
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=202915

[phoglund_chromium, 2013-05-28 08:04:34]

https://codereview.chromium.org/15688006/diff/8004/content/test/data/media/pe...
File content/test/data/media/peerconnection-call.html (right):

https://codereview.chromium.org/15688006/diff/8004/content/test/data/media/pe...
content/test/data/media/peerconnection-call.html:296: function negotiate() {
This should catch future negotiation races, such as the ones that have been
causing flakiness earlier. This change is a bit risky if there's still
simultaneous negotiations going on, but in that case it is better we catch those
and fix them.

[tommi (sloooow) - chröme, 2013-05-28 09:44:28]

lgtm

[commit-bot: I haz the power, 2013-05-28 10:51:23]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/phoglund@chromium.org/15688006/8004

[commit-bot: I haz the power, 2013-05-28 13:09:58]

Retried try job too often on linux_chromeos for step(s) browser_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...

[commit-bot: I haz the power, 2013-05-29 10:17:55]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/phoglund@chromium.org/15688006/8004

[commit-bot: I haz the power, 2013-05-29 10:17:57]

Failed to apply patch for content/browser/media/webrtc_browsertest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file content/browser/media/webrtc_browsertest.cc
  Hunk #1 FAILED at 114.
  1 out of 1 hunk FAILED -- saving rejects to file
content/browser/media/webrtc_browsertest.cc.rej

Patch:       content/browser/media/webrtc_browsertest.cc
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");
 }

[commit-bot: I haz the power, 2013-05-29 12:09:09]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/phoglund@chromium.org/15688006/31001

[commit-bot: I haz the power, 2013-05-29 18:19:18]

Change committed as 202915