Remove some more 'assert_throws' usage

Tackling the set of calls that avoided the automated refactor (for
various reasons). There are about 50 in total, split up into a few CLs
to make reviewing it easier.

Bug: 1051932
Change-Id: I3d51fe842f2858e9528b9012cb9da9d29e300c9e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2083736Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Yoshifumi Inoue <yosin@chromium.org>
Reviewed-by: Fernando Serboncini <fserb@chromium.org>
Reviewed-by: Dan Elphick <delphick@chromium.org>
Reviewed-by: Jens Widell <jl@opera.com>
Commit-Queue: Stephen McGruer <smcgruer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#750555}

third_party/blink/web_tests/fast/canvas-api/canvas-hit-regions-fallback-element-test-1.html

@@ -51,7 +51,7 @@ function canvas_fallback_test(element, expected) {
     context.clearRect(0, 0, 400, 400);
     context.rect(0, 0, 100, 100);
     if (expected) {
-      assert_throws(expected, function() {
+      assert_throws_dom(expected, function() {
         context.addHitRegion({ control : element });
       });
     } else {
@@ -60,12 +60,10 @@ function canvas_fallback_test(element, expected) {
   }, element.id);
 }
 
-const NotSupportedError = { name : 'NotSupportedError' };
-
-canvas_fallback_test(document.getElementById('button_is_not_descendant_of_canvas'), NotSupportedError);
-canvas_fallback_test(document.querySelector('canvas'), NotSupportedError);
+canvas_fallback_test(document.getElementById('button_is_not_descendant_of_canvas'), "NotSupportedError");
+canvas_fallback_test(document.querySelector('canvas'), "NotSupportedError");
 canvas_fallback_test(document.getElementById('a'));
-canvas_fallback_test(document.getElementById('a_with_image'), NotSupportedError);
+canvas_fallback_test(document.getElementById('a_with_image'), "NotSupportedError");
 canvas_fallback_test(document.getElementById('button'));
 canvas_fallback_test(document.getElementById('checkbox'));
 canvas_fallback_test(document.getElementById('radio'));

third_party/blink/web_tests/fast/canvas-api/canvas-hit-regions-fallback-element-test-2.html

@@ -51,7 +51,7 @@ function canvas_fallback_test(element, expected) {
     context.clearRect(0, 0, 400, 400);
     context.rect(0, 0, 100, 100);
     if (expected) {
-      assert_throws(expected, function() {
+      assert_throws_dom(expected, function() {
         context.addHitRegion({ control : element });
       });
     } else {
@@ -60,16 +60,14 @@ function canvas_fallback_test(element, expected) {
   }, element.id);
 }
 
-const NotSupportedError = { name : 'NotSupportedError' };
-
-canvas_fallback_test(document.getElementById('input_image_button'), NotSupportedError);
-canvas_fallback_test(document.getElementById('empty_select'), NotSupportedError);
+canvas_fallback_test(document.getElementById('input_image_button'), "NotSupportedError");
+canvas_fallback_test(document.getElementById('empty_select'), "NotSupportedError");
 canvas_fallback_test(document.getElementById('select_size_greater_than_1'));
 canvas_fallback_test(document.getElementById('select_multiple'));
-canvas_fallback_test(document.getElementById('option_with_select'), NotSupportedError);
+canvas_fallback_test(document.getElementById('option_with_select'), "NotSupportedError");
 canvas_fallback_test(document.getElementById('option_with_select_multiple'));
 canvas_fallback_test(document.getElementById('option_with_select_size_greater_than_1'));
-canvas_fallback_test(document.getElementById('p'), NotSupportedError);
+canvas_fallback_test(document.getElementById('p'), "NotSupportedError");
 canvas_fallback_test(document.getElementById('p_with_tabindex'));
 
 </script>

third_party/blink/web_tests/fast/canvas-api/canvas-hit-regions-fallback-element-test-3.html

@@ -51,7 +51,7 @@ function canvas_fallback_test(element, expected) {
     context.clearRect(0, 0, 400, 400);
     context.rect(0, 0, 100, 100);
     if (expected) {
-      assert_throws(expected, function() {
+      assert_throws_dom(expected, function() {
         context.addHitRegion({ control : element });
       });
     } else {
@@ -60,8 +60,6 @@ function canvas_fallback_test(element, expected) {
   }, element.id);
 }
 
-const NotSupportedError = { name : 'NotSupportedError' };
-
 canvas_fallback_test(document.querySelector('canvas table'));
 canvas_fallback_test(document.querySelector('canvas tr'));
 canvas_fallback_test(document.querySelector('canvas th'));

third_party/blink/web_tests/fast/dom/element-attribute-js-null.html

@@ -18,7 +18,7 @@
             const expectedValue = attr.expectedNull;
             test(() => {
                 if (attr.isException) {
-                        assert_throws(expectedValue,
+                    assert_throws_dom(expectedValue,
                                       () => element[attr.name] = null);
                     return;
                 }

third_party/blink/web_tests/fast/harness/override-preferences-3.html

@@ -3,34 +3,32 @@
 <script src="../../resources/testharness.js"></script>
 <script src="../../resources/testharnessreport.js"></script>
 <script>
-type_error = new TypeError();
-
 test(() => {
-  assert_throws(type_error, () => {
+  assert_throws_js(TypeError, () => {
     testRunner.overridePreference();
   });
 }, "No parameters");
 
 test(() => {
-  assert_throws(type_error, () => {
+  assert_throws_js(TypeError, () => {
     testRunner.overridePreference("WebKitDefaultFontSize");
   });
 }, "Only one parameter");
 
 test(() => {
-  assert_throws(type_error, () => {
+  assert_throws_js(TypeError, () => {
     testRunner.overridePreference(5, 5);
   });
 }, "Invalid type for key parameter");
 
 test(() => {
-  assert_throws(type_error, () => {
+  assert_throws_js(TypeError, () => {
     testRunner.overridePreference("foo", 5);
   });
 }, "Unknown key parameter");
 
 test(() => {
-  assert_throws(type_error, () => {
+  assert_throws_js(TypeError, () => {
     testRunner.overridePreference("WebKitDefaultFontSize", Symbol.iterator);
   });
 }, "Failed conversion from value");

third_party/blink/web_tests/fast/js/put-forwards-expected.txt

-This is a testharness.js-based test.
-PASS Overriding getter of [PutForwards] attribute
-PASS Overriding setter of [PutForwards] target attribute
-PASS Overriding target of [PutForwards] attribute
-FAIL Exception propagation from getter of [PutForwards] attribute assert_throws: function "() => element.style = "color: green"" threw "exception" with type "string", not an object
-FAIL Exception propagation from setter of [PutForwards] target attribute assert_throws: function "() => element.style = "color: green"" threw "exception" with type "string", not an object
-PASS TypeError when getter of [PutForwards] attribute returns non-object
-Harness: the test ran to completion.
-

third_party/blink/web_tests/fast/js/put-forwards.html

@@ -65,14 +65,15 @@
         var element = document.createElement("div");
         var descriptor = Object.getOwnPropertyDescriptor(HTMLElement.prototype, "style");
 
+        const exceptionString = "exception";
         Object.defineProperty(element, "style", {
             get: function () {
-                throw "exception";
+                throw exceptionString;
             },
             set: descriptor.set
         });
 
-        assert_throws(null, () => element.style = "color: green");
+        assert_throws_exactly(exceptionString, () => element.style = "color: green");
     }, "Exception propagation from getter of [PutForwards] attribute");
 
     test(() => {
@@ -80,14 +81,15 @@
         var element_style = element.style;
         var descriptor = Object.getOwnPropertyDescriptor(CSSStyleDeclaration.prototype, "cssText");
 
+        const exceptionString = "exception";
         Object.defineProperty(element_style, "cssText", {
             get: descriptor.get,
             set: function (v) {
-                throw "exception";
+                throw exceptionString;
             }
         });
 
-        assert_throws(null, () => element.style = "color: green");
+        assert_throws_exactly(exceptionString, () => element.style = "color: green");
     }, "Exception propagation from setter of [PutForwards] target attribute");
 
     test(() => {

third_party/blink/web_tests/fast/mediarecorder/MediaRecorder-no-tracks.html

@@ -5,9 +5,9 @@
 // Check that trying to start a recording from a stream without tracks fails.
 test(function() {
   const recorder = new MediaRecorder(new MediaStream());
-  assert_throws({name: "UnknownError"}, () => recorder.start(), "DOMException");
+  assert_throws_dom("UnknownError", () => recorder.start());
   // Try again to verify that it fails the same way.
-  assert_throws({name: "UnknownError"}, () => recorder.start(), "DOMException");
+  assert_throws_dom("UnknownError", () => recorder.start());
 }, 'Trying to record a stream without tracks fails');
 
 </script>