Add promise-based addIceCandidate, setLocalDescription and setRemoteDescription to RTCPeerConnection

third_party/WebKit/LayoutTests/fast/mediastream/RTCPeerConnection-ice.html

Index: third_party/WebKit/LayoutTests/fast/mediastream/RTCPeerConnection-ice.html
diff --git a/third_party/WebKit/LayoutTests/fast/mediastream/RTCPeerConnection-ice.html b/third_party/WebKit/LayoutTests/fast/mediastream/RTCPeerConnection-ice.html
index f144b9dacfd2914c80f0bf16aa68e458ad49eaf0..30232d073d3e698fb243d48c00dddb60608303ab 100644
--- a/third_party/WebKit/LayoutTests/fast/mediastream/RTCPeerConnection-ice.html
+++ b/third_party/WebKit/LayoutTests/fast/mediastream/RTCPeerConnection-ice.html
@@ -25,24 +25,57 @@ function addIceCandidateSuccess()
     pc.close();
 }
 
-function addIceCandidateFailure()
+function unexpectedCallback()
 {
-    testFailed("addIceCandidateFailue was called.");
+    testFailed("unexpectedCallback was called.");
     finishJSTest();
 }
 
+function expectedTypeError(error)
+{
+  shouldBe(error.name, "TypeError")
+  testPassed("expectedTypeError was called.")
+}
+
 function onIceChange1()
 {
     if (pc.iceConnectionState === "completed") {
         testPassed("iceConnectionState is completed");
         iceCandidate = new RTCIceCandidate({candidate:"nano nano"});
-        shouldThrow('pc.addIceCandidate(null, addIceCandidateSuccess, addIceCandidateFailure);');
-        shouldThrow('pc.addIceCandidate(iceCandidate, null, addIceCandidateFailure);');
-        shouldThrow('pc.addIceCandidate(iceCandidate, addIceCandidateSuccess, null);');
-        shouldNotThrow('pc.addIceCandidate(iceCandidate, addIceCandidateSuccess, addIceCandidateFailure);');
+        shouldNotThrow('pc.addIceCandidate(null, addIceCandidateSuccess, unexpectedCallback).catch(expectedTypeError);');
+        shouldNotThrow('pc.addIceCandidate(iceCandidate, null, unexpectedCallback).catch(expectedTypeError);');
+        shouldNotThrow('pc.addIceCandidate(iceCandidate, addIceCandidateSuccess, null).catch(expectedTypeError);');
+        shouldNotThrow('pc.addIceCandidate(iceCandidate, addIceCandidateSuccess, unexpectedCallback);');
     }
 }
 
+function testExecutionOrderClosedConnection()
+{
+    var localPeerConnection = new webkitRTCPeerConnection(null, null);
+    orderCounter = 0;

[philipj_slow, 2016/02/18 02:31:56]

add var or let here, or it ends up on window

[Guido Urdaneta, 2016/02/18 12:30:22]

If I use var, I cannot check its value with shouldBe() functions.

+    localPeerConnection.addIceCandidate(1).catch(function(error) {
+        window.error = error;
+        shouldBe('error.name', '"TypeError"');
+        orderCounter++;
+        shouldBeEqualToNumber('orderCounter', 1);
+    });
+    localPeerConnection.close();
+    var iceCandidate = new RTCIceCandidate({candidate:"nano nano"});
+    localPeerConnection.addIceCandidate(iceCandidate, unexpectedCallback, function(error) {
+        window.error = error;
+        shouldBe('error', '"The RTCPeerConnection\'s signalingState is \'closed\'."');

[philipj_slow, 2016/02/18 02:31:56]

This is testing the right thing, the timing of asyncCallErrorCallback, but it
doesn't look like it would fail with the previous Timer implementation. What I
mean is that the call that internally reaches asyncCallErrorCallback and
enqueues the microtask needs to be sandwiched in between two other things that
enqueue microtasks. Here's an example using another API:
http://software.hixie.ch/utilities/js/live-dom-viewer/saved/3894

That case rejects the promise because of missing arguments, but the timing of
the error callback should be the same unless I've misunderstood the spec.

So your test can probably be something like:

...
localPeerConnection.close();
Promise.resolve().then(_ => orderCounter++);
localPeerConnection.addIceCandidate(/* check orderCounter in error callback */)
Promise.resolve().then(_ => orderCounter++);

Or slightly better, maintain an array of events and verify when the last promise
is resolved that the order is what you expect. Should be easier to debug when it
goes wrong.

[Guido Urdaneta, 2016/02/18 12:30:22]

It does fail with the Timer implementation.
This tests the same thing, but yours is much more elegant :)
Done.

+        orderCounter++;
+        shouldBeEqualToNumber('orderCounter', 2);
+    });
+    localPeerConnection.addIceCandidate(1).catch(function(error) {
+        window.error = error;
+        shouldBe('error.name', '"TypeError"');
+        orderCounter++;
+        shouldBeEqualToNumber('orderCounter', 3);
+    });
+}
+
+shouldNotThrow('testExecutionOrderClosedConnection()');
 shouldNotThrow('pc = new webkitRTCPeerConnection(null, null);');
 pc.oniceconnectionstatechange = onIceChange1;