webrtc wpt: s/doSignalingHandshake/exchangeOfferAnswer/g

follow-up on https://github.com/web-platform-tests/wpt/commit/e880d97b7cc36c5f3c7f794c7427b46b746e656a#diff-2878d90936c40c4a1eb3e3d833ee9155

BUG=chromium:1084006

Change-Id: I1bf03d1bab1cfaab0ca05191e04339cb3bbb9815
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2207220Reviewed-by: Harald Alvestrand <hta@chromium.org>
Commit-Queue: Philipp Hancke <philipp.hancke@googlemail.com>
Cr-Commit-Position: refs/heads/master@{#770040}

third_party/blink/web_tests/external/wpt/webrtc-priority/RTCPeerConnection-ondatachannel.html

@@ -32,7 +32,7 @@ promise_test(async (t) => {
   });
 
   exchangeIceCandidates(pc1, pc2);
-  await doSignalingHandshake(pc1, pc2);
+  await exchangeOfferAnswer(pc1, pc2);
 
   await resolver;
 }, 'In-band negotiated channel created on remote peer should match the same configuration as local ' +
@@ -57,7 +57,7 @@ promise_test(async (t) => {
   });
 
   exchangeIceCandidates(pc1, pc2);
-  await doSignalingHandshake(pc1, pc2);
+  await exchangeOfferAnswer(pc1, pc2);
 
   await resolver;
 }, 'In-band negotiated channel created on remote peer should match the same (default) ' +

third_party/blink/web_tests/external/wpt/webrtc/RTCPeerConnection-videoDetectorTest-expected.txt

-This is a testharness.js-based test.
-FAIL Signal detector detects track change within reasonable time promise_test: Unhandled rejection with value: object "ReferenceError: doSignalingHandshake is not defined"
-Harness: the test ran to completion.
-

third_party/blink/web_tests/external/wpt/webrtc/RTCPeerConnection-videoDetectorTest.html

@@ -52,7 +52,7 @@ promise_test(async t => {
     v.addEventListener('loadedmetadata', resolve);
   });
   exchangeIceCandidates(pc1, pc2);
-  doSignalingHandshake(pc1, pc2);
+  exchangeOfferAnswer(pc1, pc2);
   await metadataToBeLoaded;
   // The basic signal is a track with signal 100. We replace this
   // with tracks with signal from 0 to 255 and see if they are all

third_party/blink/web_tests/external/wpt/webrtc/RTCRtpSender-replaceTrack.https-expected.txt

@@ -8,6 +8,6 @@ PASS Calling replaceTrack(null) on sender not set to session description should
 PASS Calling replaceTrack(null) on sender set to session description should resolve with sender.track set to null
 PASS Calling replaceTrack on sender with stopped track and and set to session description should resolve with sender.track set to given track
 PASS Calling replaceTrack on sender with similar track and and set to session description should resolve with sender.track set to new track
-FAIL ReplaceTrack transmits the new track not the old track promise_test: Unhandled rejection with value: object "ReferenceError: doSignalingHandshake is not defined"
+PASS ReplaceTrack transmits the new track not the old track
 Harness: the test ran to completion.
 

third_party/blink/web_tests/external/wpt/webrtc/RTCRtpSender-replaceTrack.https.html

@@ -297,7 +297,7 @@ promise_test(async t => {
     });
   });
   exchangeIceCandidates(pc1, pc2);
-  doSignalingHandshake(pc1, pc2);
+  exchangeOfferAnswer(pc1, pc2);
   await metadataToBeLoaded;
   await detectSignal(t, v, 20);
   await sender.replaceTrack(track2);

third_party/blink/web_tests/fast/peerconnection/RTCPeerConnection-insertable-streams-audio.html

@@ -115,11 +115,11 @@ async function testAudioFlow(t, negotiationFunction) {
 }
 
 promise_test(async t => {
-  return testAudioFlow(t, doSignalingHandshake);
+  return testAudioFlow(t, exchangeOfferAnswer);
 }, 'Frames flow correctly using insertable streams');
 
 promise_test(async t => {
-  return testAudioFlow(t, doInverseSignalingHandshake);
+  return testAudioFlow(t, exchangeOfferAnswerReverse);
 }, 'Frames flow correctly using insertable streams when receiver starts negotiation');
 
 promise_test(async t => {
@@ -132,7 +132,7 @@ promise_test(async t => {
   t.add_cleanup(() => audioTrack.stop());
 
   exchangeIceCandidates(caller, callee);
-  await doSignalingHandshake(caller, callee);
+  await exchangeOfferAnswer(caller, callee);
 
   const audioSender = caller.addTrack(audioTrack);
   assert_throws_dom("InvalidStateError", () => audioSender.createEncodedStreams());
@@ -158,7 +158,7 @@ promise_test(async t => {
   });
 
   exchangeIceCandidates(caller, callee);
-  await doSignalingHandshake(caller, callee);
+  await exchangeOfferAnswer(caller, callee);
   return ontrackPromise;
 }, 'RTCRtpReceiver.createEncodedStream() throws if not requested in PC configuration');
 
@@ -207,7 +207,7 @@ promise_test(async t => {
   });
 
   exchangeIceCandidates(caller, callee);
-  await doSignalingHandshake(caller, callee);
+  await exchangeOfferAnswer(caller, callee);
 
   return onmessagePromise;
 }, 'RTCRtpSender readable stream transferred to a Worker and the Worker sends an RTCEncodedAudioFrame back');
@@ -234,7 +234,7 @@ promise_test(async t => {
   });
 
   exchangeIceCandidates(caller, callee);
-  await doSignalingHandshake(caller, callee);
+  await exchangeOfferAnswer(caller, callee);
 
   await promise_rejects_dom(
       t, 'OperationError',
@@ -271,7 +271,7 @@ promise_test(async t => {
   });
 
   exchangeIceCandidates(caller, callee);
-  await doSignalingHandshake(caller, callee);
+  await exchangeOfferAnswer(caller, callee);
 
   // Pass frames as they come from the encoder.
   const result = await senderReader.read()

third_party/blink/web_tests/fast/peerconnection/RTCPeerConnection-insertable-streams.html

@@ -114,11 +114,11 @@ async function testVideoFlow(t, negotiationFunction) {
 }
 
 promise_test(async t => {
-  return testVideoFlow(t, doSignalingHandshake);
+  return testVideoFlow(t, exchangeOfferAnswer);
 }, 'Frames flow correctly using insertable streams');
 
 promise_test(async t => {
-  return testVideoFlow(t, doInverseSignalingHandshake);
+  return testVideoFlow(t, exchangeOfferAnswerReverse);
 }, 'Frames flow correctly using insertable streams when receiver starts negotiation');
 
 promise_test(async t => {
@@ -131,7 +131,7 @@ promise_test(async t => {
   t.add_cleanup(() => videoTrack.stop());
 
   exchangeIceCandidates(caller, callee);
-  await doSignalingHandshake(caller, callee);
+  await exchangeOfferAnswer(caller, callee);
 
   const videoSender = caller.addTrack(videoTrack);
   assert_throws_dom("InvalidStateError", () => videoSender.createEncodedStreams());
@@ -157,7 +157,7 @@ promise_test(async t => {
   });
 
   exchangeIceCandidates(caller, callee);
-  await doSignalingHandshake(caller, callee);
+  await exchangeOfferAnswer(caller, callee);
   return ontrackPromise;
 }, 'RTCRtpReceiver.createEncodedStream() throws if not requested in PC configuration');
 
@@ -207,7 +207,7 @@ promise_test(async t => {
   });
 
   exchangeIceCandidates(caller, callee);
-  await doSignalingHandshake(caller, callee);
+  await exchangeOfferAnswer(caller, callee);
 
   return onmessagePromise;
 }, 'RTCRtpSender readable stream transferred to a Worker and the Worker sends an RTCEncodedVideoFrame back');
@@ -252,7 +252,7 @@ async function testNormalDataFlowWithInsertableStreamsForOtherKind(t, normalKind
   });
 
   exchangeIceCandidates(caller, callee);
-  await doSignalingHandshake(caller, callee);
+  await exchangeOfferAnswer(caller, callee);
 
   return ontrackPromise;
 }
@@ -304,7 +304,7 @@ promise_test(async t => {
   });
 
   exchangeIceCandidates(caller, callee);
-  await doSignalingHandshake(caller, callee);
+  await exchangeOfferAnswer(caller, callee);
 
   let numSentKeyFrames = 0;
   let numSentDeltaFrames = 0;
@@ -348,7 +348,7 @@ promise_test(async t => {
   });
 
   exchangeIceCandidates(caller, callee);
-  await doSignalingHandshake(caller, callee);
+  await exchangeOfferAnswer(caller, callee);
 
   await promise_rejects_dom(
       t, 'OperationError',
@@ -385,7 +385,7 @@ promise_test(async t => {
   });
 
   exchangeIceCandidates(caller, callee);
-  await doSignalingHandshake(caller, callee);
+  await exchangeOfferAnswer(caller, callee);
 
   // Pass frames as they come from the encoder.
   const result = await senderReader.read()

third_party/blink/web_tests/fast/peerconnection/RTCPeerConnection-insertable-streams.js

@@ -23,21 +23,21 @@ function areFrameInfosEqual(frame1, frame2) {
          areArrayBuffersEqual(frame1.data, frame2.data);
 }
 
-async function doSignalingHandshake(pc1, pc2) {
+async function exchangeOfferAnswer(pc1, pc2) {
   const offer = await pc2.createOffer({offerToReceiveAudio: true, offerToReceiveVideo: true});
   // TODO(crbug.com/1066819): remove this hack when we do not receive duplicates from RTX
   //   anymore.
   // Munge the SDP to disable bandwidth probing via RTX.
   const sdp = offer.sdp.replace(new RegExp('rtx', 'g'), 'invalid');
-  await pc1.setRemoteDescription({type: 'offer', sdp});
   await pc2.setLocalDescription(offer);
+  await pc1.setRemoteDescription({type: 'offer', sdp});
 
   const answer = await pc1.createAnswer();
-  await pc2.setRemoteDescription(answer);
   await pc1.setLocalDescription(answer);
+  await pc2.setRemoteDescription(answer);
 }
 
-async function doInverseSignalingHandshake(pc1, pc2) {
+async function exchangeOfferAnswerReverse(pc1, pc2) {
   const offer = await pc2.createOffer({offerToReceiveAudio: true, offerToReceiveVideo: true});
   // Munge the SDP to disable bandwidth probing via RTX.
   const sdp = offer.sdp.replace(new RegExp('rtx', 'g'), 'invalid');

third_party/blink/web_tests/fast/peerconnection/RTCRtpSender-setParameters.html

@@ -17,7 +17,7 @@ promise_test(async t => {
   let stream = await navigator.mediaDevices.getUserMedia({ video: true });
   let videoSender = pc1.addTrack(stream.getVideoTracks()[0], stream);
 
-  await doSignalingHandshake(pc1, pc2);
+  await exchangeOfferAnswer(pc1, pc2);
   let videoParameters = videoSender.getParameters();
   videoParameters.encodings[0].active = false;
   videoParameters.encodings[0].priority = 'high';
@@ -40,7 +40,7 @@ promise_test(async t => {
   let stream = await navigator.mediaDevices.getUserMedia({ video: true });
   let videoSender = pc1.addTrack(stream.getVideoTracks()[0], stream);
 
-  await doSignalingHandshake(pc1, pc2);
+  await exchangeOfferAnswer(pc1, pc2);
   let videoParameters = videoSender.getParameters();
   videoParameters.encodings[0].maxBitrate = 0xFFFFFFFF;
   await videoSender.setParameters(videoParameters);
@@ -58,7 +58,7 @@ promise_test(async (t) => {
 
   let stream = await navigator.mediaDevices.getUserMedia({ video: true }, 1);
   let videoSender = pc1.addTrack(stream.getVideoTracks()[0], stream);
-  await doSignalingHandshake(pc1, pc2);
+  await exchangeOfferAnswer(pc1, pc2);
 
   let videoParameters = videoSender.getParameters();
   videoParameters.encodings[0].active = false;
@@ -84,7 +84,7 @@ promise_test(async (t) => {
 
   let stream = await navigator.mediaDevices.getUserMedia({ video: true }, 1);
   let videoSender = pc1.addTrack(stream.getVideoTracks()[0], stream);
-  await doSignalingHandshake(pc1, pc2);
+  await exchangeOfferAnswer(pc1, pc2);
 
   return promise_rejects_dom(
     t,
@@ -238,7 +238,7 @@ for (testCase of readOnlyParameters) {
 
     let stream = await navigator.mediaDevices.getUserMedia({ video: true }, 1);
     let videoSender = pc1.addTrack(stream.getVideoTracks()[0], stream);
-    await doSignalingHandshake(pc1, pc2);
+    await exchangeOfferAnswer(pc1, pc2);
 
     let videoParameters = videoSender.getParameters();
     if (!check || check(videoParameters)) {
@@ -258,7 +258,7 @@ for (testCase of readOnlyParameters) {
 
     let stream = await navigator.mediaDevices.getUserMedia({ audio: true }, 1);
     let audioSender = pc1.addTrack(stream.getAudioTracks()[0], stream);
-    await doSignalingHandshake(pc1, pc2);
+    await exchangeOfferAnswer(pc1, pc2);
 
     let audioParameters = audioSender.getParameters();
     if (!check || check(audioParameters)) {
@@ -321,7 +321,7 @@ for (testCase of requiredParameters) {
 
     let stream = await navigator.mediaDevices.getUserMedia({ video: true }, 1);
     let videoSender = pc1.addTrack(stream.getVideoTracks()[0], stream);
-    await doSignalingHandshake(pc1, pc2);
+    await exchangeOfferAnswer(pc1, pc2);
 
     let videoParameters = videoSender.getParameters();
     transform(videoParameters);
@@ -342,7 +342,7 @@ promise_test(async t => {
   let stream = await navigator.mediaDevices.getUserMedia({video:true});
   let videoSender = pc1.addTrack(stream.getVideoTracks()[0], stream);
 
-  await doSignalingHandshake(pc1, pc2);
+  await exchangeOfferAnswer(pc1, pc2);
   let videoParameters = videoSender.getParameters();
   videoParameters.encodings[0].maxBitrate = 50;
   await videoSender.setParameters(videoParameters);
@@ -354,7 +354,7 @@ promise_test(async t => {
 /**
   * Helper functions to tests.
   */
-async function doSignalingHandshake(localPc, remotePc) {
+async function exchangeOfferAnswer(localPc, remotePc) {
   let offer = await localPc.createOffer();
   await localPc.setLocalDescription(offer);
   await remotePc.setRemoteDescription(offer);

third_party/blink/web_tests/virtual/webrtc-wpt-plan-b/external/wpt/webrtc/RTCRtpSender-replaceTrack.https-expected.txt

@@ -8,6 +8,6 @@ FAIL Calling replaceTrack(null) on sender not set to session description should
 FAIL Calling replaceTrack(null) on sender set to session description should resolve with sender.track set to null promise_test: Unhandled rejection with value: object "InvalidStateError: Failed to execute 'addTransceiver' on 'RTCPeerConnection': This operation is only supported in 'unified-plan'."
 FAIL Calling replaceTrack on sender with stopped track and and set to session description should resolve with sender.track set to given track promise_test: Unhandled rejection with value: object "InvalidStateError: Failed to execute 'addTransceiver' on 'RTCPeerConnection': This operation is only supported in 'unified-plan'."
 FAIL Calling replaceTrack on sender with similar track and and set to session description should resolve with sender.track set to new track promise_test: Unhandled rejection with value: object "InvalidStateError: Failed to execute 'addTransceiver' on 'RTCPeerConnection': This operation is only supported in 'unified-plan'."
-FAIL ReplaceTrack transmits the new track not the old track promise_test: Unhandled rejection with value: object "ReferenceError: doSignalingHandshake is not defined"
+PASS ReplaceTrack transmits the new track not the old track
 Harness: the test ran to completion.