webrtc: update WPT for addIceCandidate(null)

BUG=chromium:978582

Change-Id: I4f6e93bd900ad8f5caf55143ded48280a6b26475

webrtc/RTCDtlsTransport-state.html

@@ -93,22 +93,8 @@
   t.add_cleanup(() => pc1.close());
   t.add_cleanup(() => pc2.close());
 
-  pc1.onicecandidate = e => {
-    if (e.candidate) {
-      pc2.addIceCandidate({
-        candidate: e.candidate.candidate,
-        sdpMid: e.candidate.sdpMid
-      });
-    }
-  }
-  pc2.onicecandidate = e => {
-    if (e.candidate) {
-      pc1.addIceCandidate({
-        candidate: e.candidate.candidate,
-        sdpMid: e.candidate.sdpMid
-      });
-    }
-  }
+  pc1.onicecandidate = e => pc2.addIceCandidate(e.candidate);
+  pc2.onicecandidate = e => pc1.addIceCandidate(e.candidate);
 
   pc1.addTransceiver("video");
   pc1.addTransceiver("audio");

webrtc/RTCPeerConnection-addIceCandidate-connectionSetup.html

@@ -35,16 +35,8 @@
 
   let candidates1to2 = [];
   let candidates2to1 = [];
-  pc1.onicecandidate = event => {
-    if (event.candidate) {
-      candidates1to2.push(event.candidate);
-    }
-  }
-  pc2.onicecandidate = event => {
-    if (event.candidate) {
-      candidates2to1.push(event.candidate);
-    }
-  }
+  pc1.onicecandidate = e => candidates1to2.push(e.candidate);
+  pc2.onicecandidate = e => candidates2to1.push(e.candidate);
   const pc2GatheredCandidates = new Promise((resolve) => {
     pc2.addEventListener('icegatheringstatechange', () => {
       if (pc2.iceGatheringState == 'complete') {
@@ -74,16 +66,8 @@
 
   let candidates1to2 = [];
   let candidates2to1 = [];
-  pc1.onicecandidate = event => {
-    if (event.candidate) {
-      candidates1to2.push(event.candidate);
-    }
-  }
-  pc2.onicecandidate = event => {
-    if (event.candidate) {
-      candidates2to1.push(event.candidate);
-    }
-  }
+  pc1.onicecandidate = e => candidates1to2.push(e.candidate);
+  pc2.onicecandidate = e => candidates2to1.push(e.candidate);
   const pc1GatheredCandidates = new Promise((resolve) => {
     pc1.addEventListener('icegatheringstatechange', () => {
       if (pc1.iceGatheringState == 'complete') {

webrtc/RTCPeerConnection-helper.js

@@ -176,11 +176,9 @@ function exchangeIceCandidates(pc1, pc2) {
     localPc.addEventListener('icecandidate', event => {
       const { candidate } = event;
 
-      // candidate may be null to indicate end of candidate gathering.
-      // There is ongoing discussion on w3c/webrtc-pc#1213
-      // that there should be an empty candidate string event
-      // for end of candidate for each m= section.
-      if(candidate && remotePc.signalingState !== 'closed') {
+      // Guard against already closed peerconnection to
+      // avoid unrelated exceptions.
+      if (remotePc.signalingState !== 'closed') {
         remotePc.addIceCandidate(candidate);
       }
     });

webrtc/RTCPeerConnection-iceConnectionState.https.html

@@ -320,15 +320,11 @@
   t.add_cleanup(() => pc1.close());
   const pc2 = new RTCPeerConnection();
   t.add_cleanup(() => pc2.close());
-  pc1.onicecandidate = async e => {
-    if (e.candidate) {
-      await pc2.addIceCandidate(e.candidate);
-    }
-  };
+  pc1.onicecandidate = e => pc2.addIceCandidate(e.candidate);
   pc1.candidateBuffer = [];
   pc2.onicecandidate = e => {
     // Don't add candidate if candidate buffer is already used
-    if (e.candidate && pc1.candidateBuffer) {
+    if (pc1.candidateBuffer) {
       pc1.candidateBuffer.push(e.candidate)
     }
   };

webrtc/RTCPeerConnection-restartIce.https.html

@@ -153,22 +153,8 @@
     t.add_cleanup(() => pc1.close());
     t.add_cleanup(() => pc2.close());
 
-    pc1.onicecandidate = e => {
-      if (e.candidate) {
-        pc2.addIceCandidate({
-          candidate: e.candidate.candidate,
-          sdpMid: e.candidate.sdpMid
-        });
-      }
-    }
-    pc2.onicecandidate = e => {
-      if (e.candidate) {
-        pc1.addIceCandidate({
-          candidate: e.candidate.candidate,
-          sdpMid: e.candidate.sdpMid
-        });
-      }
-    }
+    pc1.onicecandidate = e => pc2.addIceCandidate(e.candidate);
+    pc2.onicecandidate = e => pc1.addIceCandidate(e.candidate);
 
     // See the explanation below about Chrome's onnegotiationneeded firing
     // too early.

webrtc/RTCRtpTransceiver.https.html

@@ -92,12 +92,10 @@
 
   const trickle = (t, pc1, pc2) => {
     pc1.onicecandidate = t.step_func(async e => {
-      if (e.candidate) {
-        try {
-          await pc2.addIceCandidate(e.candidate);
-        } catch (e) {
-          assert_true(false, "addIceCandidate threw error: " + e.name);
-        }
+      try {
+        await pc2.addIceCandidate(e.candidate);
+      } catch (e) {
+        assert_true(false, "addIceCandidate threw error: " + e.name);
       }
     });
   };

webrtc/datachannel-emptystring.html

@@ -60,18 +60,10 @@ <h2>Messages exchanged</h2>
     }
   });
 
-  function exchangeIce(pc) {
-     return function(e) {
-       if (e.candidate) {
-          pc.addIceCandidate(e.candidate);
-       }
-     };
-  }
-
   function exchangeDescription(pc1, pc2) {
-     return function() {
-       return pc1.setRemoteDescription(pc2.localDescription);
-     };
+    return function() {
+      return pc1.setRemoteDescription(pc2.localDescription);
+    };
   }
 
   test.step(function() {
@@ -81,8 +73,8 @@ <h2>Messages exchanged</h2>
     gSecondConnection = new RTCPeerConnection(null);
     test.add_cleanup(() => gSecondConnection.close());
 
-    gFirstConnection.onicecandidate = exchangeIce(gSecondConnection);
-    gSecondConnection.onicecandidate = exchangeIce(gFirstConnection);
+    gFirstConnection.onicecandidate = e => gSecondConnection.addIceCandidate(e.candidate);
+    gSecondConnection.onicecandidate = e => gFirstConnection.addIceCandidate(e.candidate);
 
     gSecondConnection.ondatachannel = onReceiveChannel;
 

webrtc/getstats.html

@@ -27,16 +27,11 @@ <h2>Retrieved stats info</h2>
   var gSecondConnection = null;
 
   var onIceCandidateToFirst = test.step_func(function(event) {
-    // If event.candidate is null = no more candidates.
-    if (event.candidate) {
-      gSecondConnection.addIceCandidate(event.candidate);
-    }
+    gSecondConnection.addIceCandidate(event.candidate);
   });
 
   var onIceCandidateToSecond = test.step_func(function(event) {
-    if (event.candidate) {
-      gFirstConnection.addIceCandidate(event.candidate);
-    }
+    gFirstConnection.addIceCandidate(event.candidate);
   });
 
   var getStatsRecordByType = function(stats, type) {

webrtc/no-media-call.html

@@ -58,16 +58,11 @@ <h2>iceConnectionState info</h2>
   };
 
   var onIceCandidateToFirst = test.step_func(function(event) {
-    // If event.candidate is null = no more candidates.
-    if (event.candidate) {
-      gSecondConnection.addIceCandidate(event.candidate);
-    }
+    gSecondConnection.addIceCandidate(event.candidate);
   });
 
   var onIceCandidateToSecond = test.step_func(function(event) {
-    if (event.candidate) {
-      gFirstConnection.addIceCandidate(event.candidate);
-    }
+    gFirstConnection.addIceCandidate(event.candidate);
   });
 
   var onIceConnectionStateChange = test.step_func(function(event) {

webrtc/promises-call.html

@@ -24,16 +24,11 @@ <h2>iceConnectionState info</h2>
   var gSecondConnection = null;
 
   var onIceCandidateToFirst = test.step_func(function(event) {
-    // If event.candidate is null = no more candidates.
-    if (event.candidate) {
-      gSecondConnection.addIceCandidate(event.candidate);
-    }
+    gSecondConnection.addIceCandidate(event.candidate);
   });
 
   var onIceCandidateToSecond = test.step_func(function(event) {
-    if (event.candidate) {
-      gFirstConnection.addIceCandidate(event.candidate);
-    }
+    gFirstConnection.addIceCandidate(event.candidate);
   });
 
   var onIceConnectionStateChange = test.step_func(function(event) {

webrtc/protocol/split.https.html

@@ -38,16 +38,22 @@
     if (e.candidate) {
       const target = e.candidate.sdpMLineIndex === 0 ? calleeAudio : calleeVideo;
       target.addIceCandidate({sdpMid: e.candidate.sdpMid, candidate: e.candidate.candidate});
+    } else {
+      calleeAudio.addIceCandidate();
+      calleeVideo.addIceCandidate();
     }
   });
   calleeAudio.addEventListener('icecandidate', (e) => {
     if (e.candidate) {
       caller.addIceCandidate({sdpMid: e.candidate.sdpMid, candidate: e.candidate.candidate});
     }
+    // Note: caller.addIceCandidate is only called for video to avoid calling it twice.
   });
   calleeVideo.addEventListener('icecandidate', (e) => {
     if (e.candidate) {
       caller.addIceCandidate({sdpMid: e.candidate.sdpMid, candidate: e.candidate.candidate});
+    } else {
+      caller.addIceCandidate();
     }
   });
 

webrtc/simplecall-no-ssrcs.https.html

@@ -88,16 +88,11 @@
   };
 
   var onIceCandidateToFirst = test.step_func(function(event) {
-    // If event.candidate is null = no more candidates.
-    if (event.candidate) {
-      gSecondConnection.addIceCandidate(event.candidate);
-    }
+    gSecondConnection.addIceCandidate(event.candidate);
   });
 
   var onIceCandidateToSecond = test.step_func(function(event) {
-    if (event.candidate) {
-      gFirstConnection.addIceCandidate(event.candidate);
-    }
+    gFirstConnection.addIceCandidate(event.candidate);
   });
 
   var onRemoteTrack = test.step_func(function(event) {

webrtc/simplecall.https.html

@@ -79,16 +79,11 @@
   };
 
   var onIceCandidateToFirst = test.step_func(function(event) {
-    // If event.candidate is null = no more candidates.
-    if (event.candidate) {
-      gSecondConnection.addIceCandidate(event.candidate);
-    }
+    gSecondConnection.addIceCandidate(event.candidate);
   });
 
   var onIceCandidateToSecond = test.step_func(function(event) {
-    if (event.candidate) {
-      gFirstConnection.addIceCandidate(event.candidate);
-    }
+    gFirstConnection.addIceCandidate(event.candidate);
   });
 
   var onRemoteTrack = test.step_func(function(event) {