Replace some assert_throws('Something', stuff) calls with assert_throws_dom

2dcontext/imagebitmap/createImageBitmap-origin.sub.html

@@ -20,14 +20,14 @@
   const canvas = document.createElement('canvas');
   const ctx = canvas.getContext('2d');
   ctx.drawImage(bitmap, 0, 0);
-  assert_throws('SecurityError', () => canvas.toDataURL());
+  assert_throws_dom('SecurityError', () => canvas.toDataURL());
 }
 
 function assert_origin_unclean_transferFromImageBitmap(bitmap) {
   var canvas = document.createElement('canvas');
   var ctx = canvas.getContext('bitmaprenderer');
   ctx.transferFromImageBitmap(bitmap);
-  assert_throws('SecurityError', () => canvas.toDataURL());
+  assert_throws_dom('SecurityError', () => canvas.toDataURL());
 }
 
 forEachCanvasSource("http://{{domains[www1]}}:{{ports[http][0]}}",

2dcontext/imagebitmap/createImageBitmap-serializable.html

@@ -47,6 +47,6 @@
   const image = await makeMakeHTMLImage(url)();
   const bitmap = await createImageBitmap(image);
 
-  assert_throws('DataCloneError', () => worker.postMessage(bitmap));
+  assert_throws_dom('DataCloneError', () => worker.postMessage(bitmap));
 }, 'Serializing a non-origin-clean ImageBitmap throws.');
 </script>

2dcontext/imagebitmap/createImageBitmap-transfer.html

@@ -46,7 +46,7 @@
   const image = await makeMakeHTMLImage(url)();
   const bitmap = await createImageBitmap(image);
 
-  assert_throws('DataCloneError',
+  assert_throws_dom('DataCloneError',
                 () => worker.postMessage(bitmap, [bitmap]));
 }, 'Transferring a non-origin-clean ImageBitmap throws.');
 

IndexedDB/clone-before-keypath-eval.html

@@ -63,7 +63,7 @@
     const tx = db.transaction('store', 'readwrite');
     const store = tx.objectStore('store');
     const obj = new ProbeObject();
-    assert_throws('DataError', () => { store.put(obj); },
+    assert_throws_dom('DataError', () => { store.put(obj); },
                   'put() should throw if primary key cannot be injected');
     assert_equals(
         obj.invalid_id_count, 1,

IndexedDB/idb-explicit-commit.any.js

@@ -61,7 +61,7 @@ promise_test(async testCase => {
   const txn = db.transaction(['books'], 'readwrite');
   const objectStore = txn.objectStore('books');
   txn.commit();
-  assert_throws('TransactionInactiveError',
+  assert_throws_dom('TransactionInactiveError',
       () => { objectStore.put({isbn: 'one', title: 'title1'}); },
       'After commit is called, the transaction should be inactive.');
   db.close();
@@ -76,7 +76,7 @@ promise_test(async testCase => {
   const objectStore = txn.objectStore('books');
   const putRequest = objectStore.put({isbn: 'one', title: 'title1'});
   putRequest.onsuccess = testCase.step_func(() => {
-    assert_throws('TransactionInactiveError',
+    assert_throws_dom('TransactionInactiveError',
       () => { objectStore.put({isbn:'two', title:'title2'}); },
       'The transaction should not be active in the callback of a request after '
       + 'commit() is called.');
@@ -95,7 +95,7 @@ promise_test(async testCase => {
   const objectStore = txn.objectStore('books');
   txn.commit();
 
-  assert_throws('TransactionInactiveError',
+  assert_throws_dom('TransactionInactiveError',
       () => { objectStore.put({isbn:'one', title:'title1'}); },
       'After commit is called, the transaction should be inactive.');
 
@@ -116,7 +116,7 @@ promise_test(async testCase => {
   const txn = db.transaction(['books'], 'readwrite');
   const objectStore = txn.objectStore('books');
   txn.abort();
-  assert_throws('InvalidStateError',
+  assert_throws_dom('InvalidStateError',
       () => { txn.commit(); },
       'The transaction should have been aborted.');
   db.close();
@@ -130,7 +130,7 @@ promise_test(async testCase => {
   const txn = db.transaction(['books'], 'readwrite');
   const objectStore = txn.objectStore('books');
   txn.commit();
-  assert_throws('InvalidStateError',
+  assert_throws_dom('InvalidStateError',
       () => { txn.commit(); },
       'The transaction should have already committed.');
   db.close();
@@ -145,7 +145,7 @@ promise_test(async testCase => {
   const objectStore = txn.objectStore('books');
   const putRequest = objectStore.put({isbn:'one', title:'title1'});
   txn.commit();
-  assert_throws('InvalidStateError',
+  assert_throws_dom('InvalidStateError',
       () => { txn.abort(); },
       'The transaction should already have committed.');
   const txn2 = db.transaction(['books'], 'readwrite');
@@ -173,7 +173,7 @@ promise_test(async testCase => {
   // state.
   await timeoutPromise(0);
 
-  assert_throws('InvalidStateError',
+  assert_throws_dom('InvalidStateError',
       () => { txn.commit(); },
       'The transaction should be inactive so calling commit should throw.');
   releaseTxnFunction();

IndexedDB/idbcursor-advance-exception-order.html

@@ -48,7 +48,7 @@
       db.deleteObjectStore('s2');
 
       setTimeout(t.step_func(() => {
-        assert_throws('TransactionInactiveError', () => { cursor.advance(1); },
+        assert_throws_dom('TransactionInactiveError', () => { cursor.advance(1); },
                       '"not active" check (TransactionInactiveError) ' +
                       'should precede "deleted" check (InvalidStateError)');
         t.done();
@@ -77,7 +77,7 @@
       cursor.advance(1);
 
       setTimeout(t.step_func(() => {
-        assert_throws('TransactionInactiveError', () => { cursor.advance(1); },
+        assert_throws_dom('TransactionInactiveError', () => { cursor.advance(1); },
                       '"not active" check (TransactionInactiveError) ' +
                       'should precede "got value" check (InvalidStateError)');
         t.done();

IndexedDB/idbcursor-advance-invalid.htm

@@ -38,10 +38,10 @@
       cursor.advance(1);
 
       // Second try
-      assert_throws('InvalidStateError',
+      assert_throws_dom('InvalidStateError',
                     function() { cursor.advance(1); }, 'second advance');
 
-      assert_throws('InvalidStateError',
+      assert_throws_dom('InvalidStateError',
                     function() { cursor.advance(3); }, 'third advance');
 
       count++;

IndexedDB/idbcursor-continue-exception-order.htm

@@ -19,7 +19,7 @@
       r.onsuccess = null;
       const cursor = r.result;
       setTimeout(t.step_func(() => {
-        assert_throws('TransactionInactiveError', () => {
+        assert_throws_dom('TransactionInactiveError', () => {
           cursor.continue({not: "a valid key"});
         }, '"Transaction inactive" check (TransactionInactiveError) ' +
            'should precede "invalid key" check (DataError)');
@@ -44,7 +44,7 @@
       cursor.continue();
       r.onsuccess = t.step_func(() => {
         setTimeout(t.step_func(() => {
-          assert_throws('TransactionInactiveError', () => {
+          assert_throws_dom('TransactionInactiveError', () => {
             cursor.continue();
           }, '"Transaction inactive" check (TransactionInactiveError) ' +
              'should precede "got value flag" check (InvalidStateError)');
@@ -68,7 +68,7 @@
       r.onsuccess = null;
       const cursor = r.result;
       cursor.continue();
-      assert_throws('InvalidStateError', () => {
+      assert_throws_dom('InvalidStateError', () => {
         cursor.continue({not: "a valid key"});
       }, '"got value flag" check (InvalidStateError) should precede ' +
          '"invalid key" check (DataError)');

IndexedDB/idbcursor-continuePrimaryKey-exceptions.htm

@@ -29,7 +29,7 @@
             assert_class_string(cursor, 'IDBCursorWithValue',
                 'result should be a cursor');
 
-            assert_throws('InvalidAccessError', function() {
+            assert_throws_dom('InvalidAccessError', function() {
                 cursor.continuePrimaryKey(2, 2);
             }, 'continuePrimaryKey() should throw if source is not an index');
         });
@@ -87,7 +87,7 @@
                 assert_equals(cursor.primaryKey, testcase.expected_primaryKey,
                     'primaryKey should match');
 
-                assert_throws('InvalidAccessError', function() {
+                assert_throws_dom('InvalidAccessError', function() {
                     cursor.continuePrimaryKey(
                         testcase.continue_key,
                         testcase.continue_primaryKey);

IndexedDB/idbcursor-delete-exception-order.htm

@@ -19,7 +19,7 @@
       r.onsuccess = null;
       const cursor = r.result;
       setTimeout(t.step_func(() => {
-        assert_throws('TransactionInactiveError', () => {
+        assert_throws_dom('TransactionInactiveError', () => {
           cursor.delete();
         }, '"Transaction inactive" check (TransactionInactivError) ' +
            'should precede "read only" check (ReadOnlyError)');
@@ -42,7 +42,7 @@
       r.onsuccess = null;
       const cursor = r.result;
       cursor.continue();
-      assert_throws('ReadOnlyError', () => {
+      assert_throws_dom('ReadOnlyError', () => {
         cursor.delete();
       }, '"Read only" check (ReadOnlyError) should precede ' +
          '"got value flag" (InvalidStateError) check');
@@ -63,7 +63,7 @@
     r.onsuccess = t.step_func(() => {
       r.onsuccess = null;
       const cursor = r.result;
-      assert_throws('ReadOnlyError', () => {
+      assert_throws_dom('ReadOnlyError', () => {
         cursor.delete();
       }, '"Read only" check (ReadOnlyError) should precede ' +
          '"key only flag" (InvalidStateError) check');

IndexedDB/idbcursor-update-exception-order.htm

@@ -19,7 +19,7 @@
       r.onsuccess = null;
       const cursor = r.result;
       setTimeout(t.step_func(() => {
-        assert_throws('TransactionInactiveError', () => {
+        assert_throws_dom('TransactionInactiveError', () => {
           cursor.update('value2');
         }, '"Transaction inactive" check (TransactionInactiveError) ' +
            'should precede "read only" check (ReadOnlyError)');
@@ -42,7 +42,7 @@
       r.onsuccess = null;
       const cursor = r.result;
       cursor.continue();
-      assert_throws('ReadOnlyError', () => {
+      assert_throws_dom('ReadOnlyError', () => {
         cursor.update('value2');
       }, '"Read only" check (ReadOnlyError) should precede '+
          '"got value flag" check (InvalidStateError)');
@@ -63,7 +63,7 @@
     r.onsuccess = t.step_func(() => {
       r.onsuccess = null;
       const cursor = r.result;
-      assert_throws('ReadOnlyError', () => {
+      assert_throws_dom('ReadOnlyError', () => {
         cursor.update('value2');
       }, '"Read only" check (ReadOnlyError) should precede '+
          '"key only flag" check (InvalidStateError)');
@@ -85,7 +85,7 @@
       r.onsuccess = null;
       const cursor = r.result;
       cursor.continue();
-      assert_throws('InvalidStateError', () => {
+      assert_throws_dom('InvalidStateError', () => {
         cursor.update({id: 123, data: 'value2'});
       }, '"Got value flag" check (InvalidStateError) should precede ' +
          '"modified key" check (DataError)');

IndexedDB/idbcursor_continue_invalid.htm

@@ -39,10 +39,10 @@
             cursor.continue(undefined);
 
             // Second try
-            assert_throws('InvalidStateError',
+            assert_throws_dom('InvalidStateError',
                 function() { cursor.continue(); }, 'second continue');
 
-            assert_throws('InvalidStateError',
+            assert_throws_dom('InvalidStateError',
                 function() { cursor.continue(3); }, 'third continue');
 
             count++;

IndexedDB/idbcursor_delete_index2.htm

@@ -32,7 +32,7 @@
             var cursor = e.target.result;
 
             assert_true(cursor instanceof IDBCursor, "cursor exist");
-            assert_throws('ReadOnlyError', function() { cursor.delete(); });
+            assert_throws_dom('ReadOnlyError', function() { cursor.delete(); });
             t.done();
         });
     }

IndexedDB/idbcursor_delete_index3.htm

@@ -30,7 +30,7 @@
         });
 
         e.target.transaction.oncomplete = t.step_func(function(e) {
-            assert_throws('TransactionInactiveError', function() { window.cursor.delete(); })
+            assert_throws_dom('TransactionInactiveError', function() { window.cursor.delete(); })
             t.done();
         });
     }

IndexedDB/idbcursor_delete_objectstore2.htm

@@ -30,7 +30,7 @@
             var cursor = e.target.result;
 
             assert_true(cursor != null, "cursor exist");
-            assert_throws('ReadOnlyError', function() { cursor.delete(); });
+            assert_throws_dom('ReadOnlyError', function() { cursor.delete(); });
             t.done();
         });
     }

IndexedDB/idbcursor_delete_objectstore3.htm

@@ -29,7 +29,7 @@
         });
 
         e.target.transaction.oncomplete = t.step_func(function(e) {
-            assert_throws('TransactionInactiveError', function() { window.cursor.delete(); })
+            assert_throws_dom('TransactionInactiveError', function() { window.cursor.delete(); })
             t.done();
         });
     }

IndexedDB/idbcursor_update_index2.htm

@@ -30,7 +30,7 @@
 
         cursor_rq.onsuccess = t.step_func(function(e) {
             var cursor = e.target.result;
-            assert_throws('ReadOnlyError', function() { cursor.update(cursor.value); });
+            assert_throws_dom('ReadOnlyError', function() { cursor.update(cursor.value); });
             t.done();
         });
     }

IndexedDB/idbcursor_update_index3.htm

@@ -31,7 +31,7 @@
         });
 
         e.target.transaction.oncomplete = t.step_func(function(e) {
-            assert_throws('TransactionInactiveError', function() { window.cursor.update(window.record); })
+            assert_throws_dom('TransactionInactiveError', function() { window.cursor.update(window.record); })
             t.done();
         });
     }

IndexedDB/idbcursor_update_index5.htm

@@ -35,7 +35,7 @@
 
             var record = cursor.value;
             record.data = document;
-            assert_throws('DataCloneError', function() {
+            assert_throws_dom('DataCloneError', function() {
                 cursor.update(record);
             });
             t.done();

IndexedDB/idbcursor_update_index7.htm

@@ -33,7 +33,7 @@
             var cursor = e.target.result;
             assert_true(cursor instanceof IDBCursor);
 
-            assert_throws('DataError', function() { cursor.update(null); });
+            assert_throws_dom('DataError', function() { cursor.update(null); });
             t.done();
         });
     }

IndexedDB/idbcursor_update_objectstore2.htm

@@ -28,7 +28,7 @@
 
         cursor_rq.onsuccess = t.step_func(function(e) {
             var cursor = e.target.result;
-            assert_throws('ReadOnlyError', function() { cursor.update(cursor.value); });
+            assert_throws_dom('ReadOnlyError', function() { cursor.update(cursor.value); });
             t.done();
         });
     }

IndexedDB/idbcursor_update_objectstore3.htm

@@ -30,7 +30,7 @@
         });
 
         e.target.transaction.oncomplete = t.step_func(function(e) {
-            assert_throws('TransactionInactiveError', function() { window.cursor.update(window.record); })
+            assert_throws_dom('TransactionInactiveError', function() { window.cursor.update(window.record); })
             t.done();
         });
     }

IndexedDB/idbcursor_update_objectstore6.htm

@@ -33,7 +33,7 @@
 
             var record = cursor.value;
             record.data = document;
-            assert_throws('DataCloneError', function() {
+            assert_throws_dom('DataCloneError', function() {
                 cursor.update(record);
             });
             t.done();

IndexedDB/idbcursor_update_objectstore8.htm

@@ -31,7 +31,7 @@
             var cursor = e.target.result;
             assert_true(cursor instanceof IDBCursor);
 
-            assert_throws('DataError', function() { cursor.update(null); });
+            assert_throws_dom('DataError', function() { cursor.update(null); });
             t.done();
         });
     }