Remove remaining promise_rejects

Replaced with promise_rejects_js and promise_rejects_dom.

Bug: 1051932
Change-Id: I3719c7857d55d177c39984390ef1a3a8f892ad69
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2116950Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Luke Z <lpz@chromium.org>
Reviewed-by: Alexander Cooper <alcooper@chromium.org>
Commit-Queue: Stephen McGruer <smcgruer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#753190}

third_party/blink/web_tests/custom-elements/embedder-custom-elements-not-exposed.html

@@ -35,7 +35,7 @@ promise_test((t) => {
   var rejectImmediatelyOrResolve =
       Promise.race([whenDefinedPromise, Promise.resolve()]);
 
-  return promise_rejects(t, 'SyntaxError', rejectImmediatelyOrResolve);
+  return promise_rejects_dom(t, 'SyntaxError', rejectImmediatelyOrResolve);
 }, 'customElements.whenDefined embedder element name');
 
 </script>

third_party/blink/web_tests/fast/canvas/OffscreenCanvas-zero-size-readback.html

@@ -59,6 +59,6 @@ function zeroSizeReadback(zeroDimension, contextType, t) {
     assert_equals(imgdata.height, 1);
   }
 
-  return promise_rejects(t, new DOMException('', 'IndexSizeError'), offscreen.convertToBlob());
+  return promise_rejects_dom(t, 'IndexSizeError', offscreen.convertToBlob());
 }
 </script>

third_party/blink/web_tests/fast/mediastream/MediaStreamTrack-applyConstraints-expected.txt

+This is a testharness.js-based test.
+PASS applyConstraints() sets the value of a constraint set by getUserMedia()
+FAIL Attempting to change the deviceId with applyConstraints() fails promise_reject_js: function "function OverconstrainedError() { [native code] }" is not an Error subtype
+PASS An unsupported constraint is ignored by applyConstraints()
+PASS All valid keys are returned for complex constraints
+PASS Simple integer
+PASS Ideal integer
+PASS Min/max integer
+PASS Exact unwrapped integer
+PASS Simple double
+PASS Ideal double
+PASS Min/max double
+PASS Exact unwrapped double
+PASS Simple String
+PASS Ideal String
+PASS Multiple String in Brackets
+PASS Multiple Bracketed Naked String
+PASS Single Bracketed string unwrapped
+PASS Both Ideal and Exact string
+PASS echoCancellation with simple boolean value
+PASS echoCancellation with ideal boolean value
+PASS echoCancellation with exact unwrapped boolean value
+PASS autoGainControl with simple boolean value
+PASS autoGainControl with ideal boolean value
+PASS autoGainControl with exact unwrapped boolean value
+PASS noiseSuppression with simple boolean value
+PASS noiseSuppression with ideal boolean value
+PASS noiseSuppression with exact unwrapped boolean value
+PASS applyConstraints() supports resizeMode in getUserMedia() tracks
+PASS Contradicting echoCancellation constraints
+PASS Contradicting noiseSuppression constraints
+PASS Contradicting autoGainControl constraints
+Harness: the test ran to completion.
+

third_party/blink/web_tests/fast/mediastream/MediaStreamTrack-applyConstraints.html

@@ -31,9 +31,9 @@ promise_test(() => {
 // The deviceId constraint must be rejected, since the source of a track cannot
 // be changed with applyConstraints.
 promise_test(test => {
-  return promise_rejects(test,
-                         new OverconstrainedError('deviceId', ''),
-                         navigator.mediaDevices.getUserMedia({audio: true})
+  return promise_rejects_js(test,
+                            OverconstrainedError,
+                            navigator.mediaDevices.getUserMedia({audio: true})
       .then(s => {
     return s.getAudioTracks()[0].applyConstraints(
         { deviceId: {exact: 'mydevice-id'}});

third_party/blink/web_tests/fast/peerconnection/RTCPeerConnection-createOffer-promise.html

@@ -20,15 +20,14 @@
 
       // Test type error
       promise_test(function() {
-        return promise_rejects(this, new TypeError(), pc.createOffer(1));
+        return promise_rejects_js(this, TypeError, pc.createOffer(1));
       }, 'createOffer(1)' );
 
       // Test closed connection
       closedPC = new RTCPeerConnection();
       closedPC.close();
       promise_test(function() {
-        var invalidStateError = new DOMException('', 'InvalidStateError');
-        return promise_rejects(this, invalidStateError, closedPC.createOffer({iceRestart:true}));
+        return promise_rejects_dom(this, 'InvalidStateError', closedPC.createOffer({iceRestart:true}));
       }, 'createOffer() with closed peer connection' );
     </script>
   </body>

third_party/blink/web_tests/fast/peerconnection/RTCPeerConnection-dataChannelTypeCollision.html

@@ -20,7 +20,7 @@ promise_test(t => {
     type: 'offer',
     sdp: 'v=0\r\no=- 2512342596970960666 2 IN IP4 127.0.0.1\r\ns=-\r\nt=0 0\r\na=group:BUNDLE data\r\na=msid-semantic: WMS\r\nm=application 9 UDP/DTLS/SCTP webrtc-datachannel\r\nc=IN IP4 0.0.0.0\r\na=ice-ufrag:xwIt\r\na=ice-pwd:WnJ0omUfzZhL3WX63jJH5mU8\r\na=ice-options:trickle\r\na=fingerprint:sha-256 E5:61:EC:E3:D4:04:55:16:E9:47:95:A7:4E:0C:82:10:A2:70:82:4F:59:29:99:B2:66:40:F2:46:86:A6:23:A3\r\na=setup:actpass\r\na=mid:data\r\na=sctp-port:5000\r\na=max-message-size:262144\r\n',
   })
-  return promise_rejects(t, "InvalidAccessError", pc.setRemoteDescription(sd));
+  return promise_rejects_dom(t, "InvalidAccessError", pc.setRemoteDescription(sd));
 }, 'Local RTP channel, remote offer of SCTP channel');
 
 </script>

third_party/blink/web_tests/fast/peerconnection/RTCPeerConnection-getStats-overrides.https.html

@@ -69,7 +69,7 @@ promise_test(async t => {
   let pc = new RTCPeerConnection();
   t.add_cleanup(() => pc.close());
   let nonsense = 5;
-  await promise_rejects(t, new TypeError(), pc.getStats(nonsense));
+  await promise_rejects_js(t, TypeError, pc.getStats(nonsense));
 }, 'Signature: getStats(nonsense) throws exception');
 
 promise_test(async t => {

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

@@ -69,11 +69,9 @@ promise_test(async (t) => {
   videoParameters.encodings[0].active = true;
   videoParameters.encodings[0].priority = 'low';
   videoParameters.encodings[0].maxBitrate = 1337001;
-  return promise_rejects(
+  return promise_rejects_dom(
     t,
-    new DOMException(
-      "getParameters() needs to be called before setParameters().",
-      "InvalidStateError"),
+    "InvalidStateError",
     videoSender.setParameters(videoParameters));
 }, 'setParameters() with multiple calls after single getParameters()');
 
@@ -88,11 +86,9 @@ promise_test(async (t) => {
   let videoSender = pc1.addTrack(stream.getVideoTracks()[0], stream);
   await doSignalingHandshake(pc1, pc2);
 
-  return promise_rejects(
+  return promise_rejects_dom(
     t,
-    new DOMException(
-      "getParameters() needs to be called before setParameters().",
-      "InvalidStateError"),
+    "InvalidStateError",
     videoSender.setParameters({
       transactionId: "",
       codecs: [],
@@ -247,9 +243,8 @@ for (testCase of readOnlyParameters) {
     let videoParameters = videoSender.getParameters();
     if (!check || check(videoParameters)) {
       transform(videoParameters);
-      return promise_rejects(t,
-        new DOMException("Read-only field modified in setParameters().",
-          "InvalidModificationError"),
+      return promise_rejects_dom(t,
+        "InvalidModificationError",
         videoSender.setParameters(videoParameters));
     }
   }).bind(undefined, testCase.name, testCase.transform, testCase.check),
@@ -268,9 +263,8 @@ for (testCase of readOnlyParameters) {
     let audioParameters = audioSender.getParameters();
     if (!check || check(audioParameters)) {
       transform(audioParameters);
-      return promise_rejects(t,
-        new DOMException("Read-only field modified in setParameters().",
-          "InvalidModificationError"),
+      return promise_rejects_dom(t,
+          "InvalidModificationError",
           audioSender.setParameters(audioParameters));
     }
   }).bind(undefined, testCase.name, testCase.transform, testCase.check),
@@ -331,8 +325,8 @@ for (testCase of requiredParameters) {
 
     let videoParameters = videoSender.getParameters();
     transform(videoParameters);
-      return promise_rejects(t,
-        new TypeError(),
+      return promise_rejects_js(t,
+        TypeError,
         videoSender.setParameters(videoParameters));
   }).bind(undefined, testCase.name, testCase.transform, testCase.check),
   'video setParameters() check for ' + testCase.name);

third_party/blink/web_tests/hid/hidDevice_openAndClose.html

@@ -64,7 +64,7 @@ hid_test(async (t, fake) => {
   assert_false(device.opened);
 
   await device.open();
-  return promise_rejects(t, 'InvalidStateError', device.open());
+  return promise_rejects_dom(t, 'InvalidStateError', device.open());
 }, 'Opening a device twice is an error');
 
 hid_test(async (t, fake) => {
@@ -81,7 +81,7 @@ hid_test(async (t, fake) => {
   assert_false(device.opened);
 
   const firstRequest = device.open();
-  await promise_rejects(t, 'InvalidStateError', device.open());
+  await promise_rejects_dom(t, 'InvalidStateError', device.open());
   await firstRequest;
 }, 'Opening a device twice simultaneously is an error');
 

third_party/blink/web_tests/hid/hidDevice_reports.html

@@ -60,8 +60,8 @@ hid_test(async (t, fake) => {
   const {device, fakeConnection} = await addAndOpenDevice(fake);
   // Simulate write() failure.
   fakeConnection.queueExpectedWrite(false, kReportId, kReportBytes);
-  await promise_rejects(t, 'NotAllowedError',
-                        device.sendReport(kReportId, kReportBytes));
+  await promise_rejects_dom(t, 'NotAllowedError',
+                            device.sendReport(kReportId, kReportBytes));
   fakeConnection.assertExpectationsMet();
 }, 'Failed sendReport rejects');
 
@@ -78,8 +78,8 @@ hid_test(async (t, fake) => {
   const {device, fakeConnection} = await addAndOpenDevice(fake);
   // Simulate getFeatureReport() failure.
   fakeConnection.queueExpectedGetFeatureReport(false, kReportId, kReportBytes);
-  await promise_rejects(t, 'NotAllowedError',
-                        device.receiveFeatureReport(kReportId));
+  await promise_rejects_dom(t, 'NotAllowedError',
+                            device.receiveFeatureReport(kReportId));
   fakeConnection.assertExpectationsMet();
 }, 'Failed receiveFeatureReport rejects');
 
@@ -95,8 +95,8 @@ hid_test(async (t, fake) => {
   const {device, fakeConnection} = await addAndOpenDevice(fake);
   // Simulate sendFeatureReport() failure.
   fakeConnection.queueExpectedSendFeatureReport(false, kReportId, kReportBytes);
-  await promise_rejects(t, 'NotAllowedError',
-                        device.sendFeatureReport(kReportId, kReportBytes));
+  await promise_rejects_dom(t, 'NotAllowedError',
+                            device.sendFeatureReport(kReportId, kReportBytes));
   fakeConnection.assertExpectationsMet();
 }, 'Failed sendFeatureReport rejects');
 

third_party/blink/web_tests/hid/hid_requestDevice.html

@@ -14,7 +14,7 @@ const kTestVendorId = 0x1234;
 const kTestProductId = 0xabcd;
 
 promise_test((t) => {
-  return promise_rejects(
+  return promise_rejects_dom(
       t, 'SecurityError', navigator.hid.requestDevice({filters: []}));
 }, 'requestDevice() rejects without a user gesture');
 

third_party/blink/web_tests/payments/payment-request-interface.html

@@ -270,7 +270,7 @@ test(function() {
 }, 'Array value for payment method specific data parameter should not throw');
 
 promise_test(function(t) {
-    return promise_rejects(t, 'InvalidStateError', new PaymentRequest([{'supportedMethods': 'foo'}], buildDetails()).abort());
+    return promise_rejects_dom(t, 'InvalidStateError', new PaymentRequest([{'supportedMethods': 'foo'}], buildDetails()).abort());
 }, 'abort() without show() should reject with error');
 
 generate_tests(assert_throws, [

third_party/blink/web_tests/wake-lock/wakelock-document-hidden.https.html

@@ -12,7 +12,7 @@ promise_test(async t => {
 
   window.testRunner.setPageVisibility('hidden');
   assert_true(document.hidden);
-  return promise_rejects(t, "NotAllowedError", navigator.wakeLock.request('screen'));
+  return promise_rejects_dom(t, "NotAllowedError", navigator.wakeLock.request('screen'));
 }, "navigator.wakeLock.request('screen') fails when the document is hidden");
 
 // This test currently checks for Chromium-specific behavior: WakeLock::request()
@@ -31,7 +31,7 @@ promise_test(async t => {
   const screenLock = navigator.wakeLock.request('screen');
   window.testRunner.setPageVisibility('hidden');
   assert_true(document.hidden);
-  return promise_rejects(t, "NotAllowedError", screenLock);
+  return promise_rejects_dom(t, "NotAllowedError", screenLock);
 }, "navigator.wakeLock.request('screen') aborts when the page is hidden");
 
 promise_test(async t => {

third_party/blink/web_tests/wpt_internal/webxr/navigator_xr_detached.https-expected.txt

-This is a testharness.js-based test.
-FAIL Check that navigator.xr.supportsSession and navigator.xr.requestSession reject on a detached navigator. promise_rejects is not defined
-Harness: the test ran to completion.
-

third_party/blink/web_tests/wpt_internal/webxr/navigator_xr_detached.https.html

@@ -11,9 +11,10 @@
 // This behavior is not in the webxr spec, so this is an internal-only test.
 promise_test((t) => {
   var nav_xr = window.frames[0].navigator.xr;
+  const dom_exception = window.frames[0].DOMException;
   document.getElementById("subframe").remove();
-  return promise_rejects(t, "InvalidStateError", nav_xr.supportsSession('inline'))
-      .then(() => promise_rejects(t, "InvalidStateError", nav_xr.requestSession('inline')));
+  return promise_rejects_dom(t, "InvalidStateError", dom_exception, nav_xr.supportsSession('inline'))
+      .then(() => promise_rejects_dom(t, "InvalidStateError", dom_exception, nav_xr.requestSession('inline')));
 }, "Check that navigator.xr.supportsSession and navigator.xr.requestSession reject on a detached navigator.");
 
 </script>

third_party/blink/web_tests/wpt_internal/webxr/xrDevice_supportsSession_immersive_unsupported.https-expected.txt

-This is a testharness.js-based test.
-FAIL supportsSession rejects when options not supported promise_test: Unhandled rejection with value: object "ReferenceError: promise_rejects is not defined"
-Harness: the test ran to completion.
-

third_party/blink/web_tests/wpt_internal/webxr/xrDevice_supportsSession_immersive_unsupported.https.html

@@ -13,7 +13,7 @@
       (t) => {
       return navigator.xr.test.simulateDeviceConnection(VALID_NON_IMMERSIVE_DEVICE)
         .then( (controller) => {
-          return promise_rejects(
+          return promise_rejects_dom(
             t,
             "NotSupportedError",
             navigator.xr.supportsSession('immersive-vr')