summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorperkj@chromium.org <perkj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-15 07:47:07 +0000
committerperkj@chromium.org <perkj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-15 07:47:07 +0000
commit56f5860a76a88cf2b8e60a27a3e648e9eb19df70 (patch)
tree5321102bfd4f8d623b98ce33a41d12464ada4e05 /content
parentdcfefa5a44e4b5c63c075f372dd5a0d6e9a75beb (diff)
downloadchromium_src-56f5860a76a88cf2b8e60a27a3e648e9eb19df70.zip
chromium_src-56f5860a76a88cf2b8e60a27a3e648e9eb19df70.tar.gz
chromium_src-56f5860a76a88cf2b8e60a27a3e648e9eb19df70.tar.bz2
Remove workaround in WebrtcBrowserTest.CallWithDataAndMedia.
The underlaying problem in http://code.google.com/p/webrtc/issues/detail?id=1262 has been fixed. Review URL: https://chromiumcodereview.appspot.com/12255004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182642 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/test/data/media/peerconnection-call.html13
1 files changed, 2 insertions, 11 deletions
diff --git a/content/test/data/media/peerconnection-call.html b/content/test/data/media/peerconnection-call.html
index b7657f9..2a6eded 100644
--- a/content/test/data/media/peerconnection-call.html
+++ b/content/test/data/media/peerconnection-call.html
@@ -105,17 +105,8 @@
// When |secondDataChannel| receive a message, send a message back.
secondDataChannel.onmessage = function(event) {
expectEquals(event.data, sendDataString);
- // TODO(perkj): Currently we sometimes can't send a message here since
- // the the |dataChannel.readyState| has not transitioned to open yet.
- // http://code.google.com/p/webrtc/issues/detail?id=1262
- if (secondDataChannel.readyState == "open") {
- secondDataChannel.send(sendDataString);
- } else {
- secondDataChannel.onopen = function(event) {
- expectEquals('open', secondDataChannel.readyState);
- secondDataChannel.send(sendDataString);
- }
- }
+ expectEquals('open', secondDataChannel.readyState);
+ secondDataChannel.send(sendDataString);
}
}
}