Fix broken Promise-related layout tests.

Because of the bindings change related to Promise-returning functions (see
http://crbug.com/359411), some layout tests that had been written before that
have been broken. As the bindings change is done, this CL fixes these tests.

BUG=362992

Review URL: https://codereview.chromium.org/669353002

git-svn-id: svn://svn.chromium.org/blink/trunk@184319 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/LayoutTests/TestExpectations

@@ -900,14 +900,6 @@ crbug.com/365400 [ Mac ] compositing/images/direct-pdf-image.html [ Pass ImageOn
 crbug.com/306222 fast/hidpi/image-srcset-relative-svg-canvas.html [ Skip ]
 crbug.com/306222 fast/hidpi/image-srcset-relative-svg-canvas-2x.html [ Skip ]
 
-crbug.com/362992 fast/canvas/canvas-createImageBitmap-invalid-args-in-workers.html [ Skip ]
-crbug.com/362992 fast/canvas/canvas-createImageBitmap-invalid-args.html [ Skip ]
-crbug.com/362992 http/tests/security/cross-origin-createImageBitmap.html [ Skip ]
-crbug.com/362992 storage/quota/storagequota-query-info.html [ Skip ]
-crbug.com/362992 storage/quota/storagequota-request-persistent-quota.html [ Skip ]
-crbug.com/362992 virtual/gpu/fast/canvas/canvas-createImageBitmap-invalid-args-in-workers.html [ Skip ]
-crbug.com/362992 virtual/gpu/fast/canvas/canvas-createImageBitmap-invalid-args.html [ Skip ]
-
 crbug.com/362434 [ Mac ] compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents.html [ ImageOnlyFailure Pass ]
 crbug.com/362434 [ Mac ] virtual/prefer_compositing_to_lcd_text/compositing/overflow/do-not-paint-outline-into-composited-scrolling-contents.html [ ImageOnlyFailure Pass ]
 

third_party/WebKit/LayoutTests/fast/canvas/canvas-createImageBitmap-invalid-args-expected.txt

@@ -3,26 +3,66 @@ Ensure correct behavior of createImageBitmap for invalid inputs.
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS createImageBitmap(image) threw exception InvalidStateError: Failed to execute 'createImageBitmap' on 'Window': No image can be retrieved from the provided element..
-PASS createImageBitmap(video) threw exception InvalidStateError: Failed to execute 'createImageBitmap' on 'Window': No player can be retrieved from the provided video element..
-PASS createImageBitmap(undefined) threw exception TypeError: Failed to execute 'createImageBitmap' on 'Window': No function was found that matched the signature provided..
-PASS createImageBitmap(null) threw exception TypeError: Failed to execute 'createImageBitmap' on 'Window': No function was found that matched the signature provided..
-PASS createImageBitmap(image, 0, 0, 10, 0) threw exception IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source height provided is 0..
-PASS createImageBitmap(image, 0, 0, 0, 10) threw exception IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source width provided is 0..
-PASS createImageBitmap(video, 0, 0, 10, 0) threw exception IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source height provided is 0..
-PASS createImageBitmap(video, 0, 0, 0, 10) threw exception IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source width provided is 0..
-PASS createImageBitmap(aCanvas, 0, 0, 10, 0) threw exception IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source height provided is 0..
-PASS createImageBitmap(aCanvas, 0, 0, 0, 10) threw exception IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source width provided is 0..
-PASS createImageBitmap(d, 0, 0, 10, 0) threw exception IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source height provided is 0..
-PASS createImageBitmap(d, 0, 0, 0, 10) threw exception IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source width provided is 0..
-PASS createImageBitmap(aCtx, 0, 0, 10, 0) threw exception IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source height provided is 0..
-PASS createImageBitmap(aCtx, 0, 0, 0, 10) threw exception IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source width provided is 0..
-PASS createImageBitmap(testBitmap, 0, 0, 10, 0) threw exception IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source height provided is 0..
-PASS createImageBitmap(testBitmap, 0, 0, 0, 10) threw exception IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source width provided is 0..
-PASS createImageBitmap(blob, 0, 0, 10, 0) threw exception IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source height provided is 0..
-PASS createImageBitmap(blob, 0, 0, 0, 10) threw exception IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source width provided is 0..
-PASS createImageBitmap(invalidBlob) was rejected.
-PASS createImageBitmap(invalidCanvas) was rejected.
+PASS Rejected as expected: undefined
+PASS reason instanceof Error is true
+TypeError: Failed to execute 'createImageBitmap' on 'Window': No function was found that matched the signature provided.
+PASS Rejected as expected: null
+PASS reason instanceof Error is true
+TypeError: Failed to execute 'createImageBitmap' on 'Window': No function was found that matched the signature provided.
+PASS Rejected as expected: empty image
+PASS reason instanceof Error is true
+InvalidStateError: Failed to execute 'createImageBitmap' on 'Window': No image can be retrieved from the provided element.
+PASS Rejected as expected: empty video
+PASS reason instanceof Error is true
+InvalidStateError: Failed to execute 'createImageBitmap' on 'Window': The provided element has not retrieved data.
+PASS Rejected as expected: image / invalid range
+PASS reason instanceof Error is true
+IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source height provided is 0.
+PASS Rejected as expected: image / invalid range
+PASS reason instanceof Error is true
+IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source width provided is 0.
+PASS Rejected as expected: video / invalid range
+PASS reason instanceof Error is true
+IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source height provided is 0.
+PASS Rejected as expected: video / invalid range
+PASS reason instanceof Error is true
+IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source width provided is 0.
+PASS Rejected as expected: canvas / invalid range
+PASS reason instanceof Error is true
+IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source height provided is 0.
+PASS Rejected as expected: canvas / invalid range
+PASS reason instanceof Error is true
+IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source width provided is 0.
+PASS Rejected as expected: canvas context / invalid range
+PASS reason instanceof Error is true
+IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source height provided is 0.
+PASS Rejected as expected: canvas context / invalid range
+PASS reason instanceof Error is true
+IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source width provided is 0.
+PASS Rejected as expected: canvas imagedata / invalid range
+PASS reason instanceof Error is true
+IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source height provided is 0.
+PASS Rejected as expected: canvas imagedata / invalid range
+PASS reason instanceof Error is true
+IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source width provided is 0.
+PASS Rejected as expected: image bitmap / invalid range
+PASS reason instanceof Error is true
+IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source height provided is 0.
+PASS Rejected as expected: image bitmap / invalid range
+PASS reason instanceof Error is true
+IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source width provided is 0.
+PASS Rejected as expected: blob / invalid range
+PASS reason instanceof Error is true
+IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source height provided is 0.
+PASS Rejected as expected: blob / invalid range
+PASS reason instanceof Error is true
+IndexSizeError: Failed to execute 'createImageBitmap' on 'Window': The source width provided is 0.
+PASS Rejected as expected: invalid blob
+FAIL reason instanceof Error should be true. Was false.
+null
+PASS Rejected as expected: invalid canvas
+FAIL reason instanceof Error should be true. Was false.
+null
 PASS successfullyParsed is true
 
 TEST COMPLETE

third_party/WebKit/LayoutTests/fast/canvas/canvas-createImageBitmap-invalid-args-in-workers-expected.txt

@@ -4,9 +4,15 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 
 Starting worker: ./resources/canvas-createImageBitmap-invalid-args-in-workers.js
-PASS [Worker] createImageBitmap(null, 0, 0, 10, 10) threw exception TypeError: Failed to execute 'createImageBitmap' on 'WorkerGlobalScope': No function was found that matched the signature provided..
-PASS [Worker] createImageBitmap(data, 0, 0, 10, 0) threw exception IndexSizeError: Failed to execute 'createImageBitmap' on 'WorkerGlobalScope': The source height provided is 0..
-PASS [Worker] createImageBitmap(data, 0, 0, 0, 10) threw exception IndexSizeError: Failed to execute 'createImageBitmap' on 'WorkerGlobalScope': The source width provided is 0..
+PASS [Worker] Rejected as expected: null
+PASS [Worker] reason instanceof Error is true
+[Worker] TypeError: Failed to execute 'createImageBitmap' on 'WorkerGlobalScope': No function was found that matched the signature provided.
+PASS [Worker] Rejected as expected: invalid area
+PASS [Worker] reason instanceof Error is true
+[Worker] IndexSizeError: Failed to execute 'createImageBitmap' on 'WorkerGlobalScope': The source height provided is 0.
+PASS [Worker] Rejected as expected: invalid area
+PASS [Worker] reason instanceof Error is true
+[Worker] IndexSizeError: Failed to execute 'createImageBitmap' on 'WorkerGlobalScope': The source width provided is 0.
 PASS successfullyParsed is true
 
 TEST COMPLETE

third_party/WebKit/LayoutTests/fast/canvas/canvas-createImageBitmap-invalid-args.html

@@ -8,150 +8,130 @@
 description("Ensure correct behavior of createImageBitmap for invalid inputs.");
 window.jsTestIsAsync = true;
 
-var TypeError = "TypeError: Failed to execute 'createImageBitmap' on 'Window': No function was found that matched the signature provided.";
-var IndexSizeError = "IndexSizeError: Index or size was negative, or greater than the allowed value.";
-
-var image;
-var testBitmap; // an ImageBitmap that is uncropped. We use this to test createImageBitmap(testBitmap)
-var d;          // image.imageData
-var blob;
-var invalidBlob;
-var invalidBlobTestPassed = false;
-var invalidCanvasTestPassed = false;
-
-// Draw to an auxillary canvas.
-var aCanvas = document.createElement("canvas");
-aCanvas.setAttribute("width", "200");
-aCanvas.setAttribute("height", "200");
-var aCtx = aCanvas.getContext("2d");
-
-// Create a terapixel canvas to generate an invalid canvas through allocation failure
-var invalidCanvas = document.createElement("canvas");
-invalidCanvas.setAttribute("width", "1000000");
-invalidCanvas.setAttribute("height", "1000000");
-
-image = new Image();
-image.onload = imageLoaded;
-
-// Before image loads
-shouldThrow("createImageBitmap(image)");
-image.src = aCanvas.toDataURL();
-
-video = document.createElement("video");
-video.addEventListener("canplaythrough", videoLoaded, false);
-
-// Before video loads
-shouldThrow("createImageBitmap(video)");
-video.src = "../../compositing/resources/video.ogv";
-
-var imageLoaded = false;
-var videoLoaded = false;
-var imageBitmapLoaded = false;
-var blobLoaded = false;
-var invalidBlobLoaded = false;
-
-function imageLoaded() {
-    createImageBitmap(image).then(imageBitmapLoadedCallback, function() {
-        testFailed("Promise was rejected.");
-        finishJSTest();
-    });
-    d = aCtx.getImageData(0, 0, 200, 200);
-    imageLoaded = true;
-    loaded();
+var reason;
+
+function shouldBeRejected(promise, message) {
+    return promise.then(function() {
+        testFailed('Resolved unexpectedly: ' + message);
+    }, function(e) {
+        reason = e;
+        testPassed('Rejected as expected: ' + message);
+        shouldBeTrue('reason instanceof Error');
+        debug(e);
+    });
 }
 
-function videoLoaded() {
-    videoLoaded = true;
-    loaded();
+function checkInvalidRange(source, message) {
+    return Promise.resolve().then(function() {
+        return shouldBeRejected(createImageBitmap(source, 0, 0, 10, 0), message + ' / invalid range');
+    }).then(function() {
+        return shouldBeRejected(createImageBitmap(source, 0, 0, 0, 10), message + ' / invalid range');
+    });
 }
 
-function imageBitmapLoadedCallback(imageBitmap) {
-    testBitmap = imageBitmap;
-    imageBitmapLoaded = true;
-    loaded();
+function createCanvas() {
+    return new Promise(function(resolve, reject) {
+        var canvas = document.createElement('canvas');
+        canvas.setAttribute('width', '200');
+        canvas.setAttribute('height', '200');
+        resolve(canvas);
+    });
 }
 
-var xhr = new XMLHttpRequest();
-xhr.open("GET", 'resources/pattern.png');
-xhr.responseType = 'blob';
-xhr.send();
-xhr.onload = function() {
-    blob = xhr.response;
-    blobLoaded = true;
-    loaded();
+function createInvalidCanvas() {
+    // Create a terapixel canvas to generate an invalid canvas through
+    // allocation failure
+    return new Promise(function(resolve, reject) {
+        var canvas = document.createElement('canvas');
+        canvas.setAttribute('width', '100000000');
+        canvas.setAttribute('height', '100000000');
+        resolve(canvas);
+    });
 }
 
-var xhr2 = new XMLHttpRequest();
-xhr2.open("GET", 'resources/shadow-offset.js');
-xhr2.responseType = 'blob';
-xhr2.send();
-xhr2.onload = function() {
-    invalidBlob = xhr2.response;
-    invalidBlobLoaded = true;
-    loaded();
+function createVideo() {
+    return new Promise(function(resolve, reject) {
+        var video = document.createElement('video');
+        video.addEventListener('canplaythrough', resolve.bind(undefined, video), false);
+        video.src = '../../compositing/resources/video.ogv';
+    });
 }
 
-var finishIfDoneCallsRemaining = 2;
-function finishIfDone() {
-    finishIfDoneCallsRemaining--;
-    if (!finishIfDoneCallsRemaining) {
-        // Because promise fulfillment is asynchonous, pass/fail messages
-        // must be handled here to ensure a deterministic message order.
-        if (invalidBlobTestPassed) {
-            testPassed("createImageBitmap(invalidBlob) was rejected.");
-        } else {
-            testFailed("Invalid blob fulfilled.");
-        }
-        if (invalidCanvasTestPassed) {
-            testPassed("createImageBitmap(invalidCanvas) was rejected.");
-        } else {
-            testFailed("Invalid canvas fulfilled.");
-        }
-        finishJSTest();
-    }
+function createImage() {
+    return createCanvas().then(function(canvas) {
+        var image = new Image();
+        var promise = new Promise(function(resolve, reject) {
+            image.onload = resolve.bind(undefined, image);
+        });
+        image.src = canvas.toDataURL();
+        return promise;
+    });
 }
 
-function loaded() {
-    if (imageLoaded && videoLoaded && imageBitmapLoaded && blobLoaded && invalidBlobLoaded) {
-        shouldThrow("createImageBitmap(undefined)", "TypeError");
-        shouldThrow("createImageBitmap(null)", "TypeError");
-
-        shouldThrow("createImageBitmap(image, 0, 0, 10, 0)");
-        shouldThrow("createImageBitmap(image, 0, 0, 0, 10)");
-
-        shouldThrow("createImageBitmap(video, 0, 0, 10, 0)");
-        shouldThrow("createImageBitmap(video, 0, 0, 0, 10)");
-
-        shouldThrow("createImageBitmap(aCanvas, 0, 0, 10, 0)");
-        shouldThrow("createImageBitmap(aCanvas, 0, 0, 0, 10)");
-
-        shouldThrow("createImageBitmap(d, 0, 0, 10, 0)");
-        shouldThrow("createImageBitmap(d, 0, 0, 0, 10)");
-
-        shouldThrow("createImageBitmap(aCtx, 0, 0, 10, 0)");
-        shouldThrow("createImageBitmap(aCtx, 0, 0, 0, 10)");
-
-        shouldThrow("createImageBitmap(testBitmap, 0, 0, 10, 0)");
-        shouldThrow("createImageBitmap(testBitmap, 0, 0, 0, 10)");
-
-        shouldThrow("createImageBitmap(blob, 0, 0, 10, 0)");
-        shouldThrow("createImageBitmap(blob, 0, 0, 0, 10)");
+function createBlob(url) {
+    return new Promise(function(resolve, reject) {
+        var xhr = new XMLHttpRequest();
+        xhr.open('GET', url);
+        xhr.responseType = 'blob';
+        xhr.onload = function() {
+            resolve(xhr.response);
+        };
+        xhr.onerror = reject;
+        xhr.send();
+    });
+}
 
-        createImageBitmap(invalidBlob).then(function() {
-            finishIfDone();
-        }, function() {
-            invalidBlobTestPassed = true;
-            finishIfDone();
-        });
+Promise.resolve().then(function() {
+    return shouldBeRejected(createImageBitmap(undefined), 'undefined');
+}).then(function() {
+    return shouldBeRejected(createImageBitmap(null), 'null');
+}).then(function() {
+    return shouldBeRejected(createImageBitmap(new Image), 'empty image');
+}).then(function() {
+    return shouldBeRejected(createImageBitmap(document.createElement('video')), 'empty video');
+}).then(function() {
+    return createImage().then(function(image) {
+        return checkInvalidRange(image, 'image');
+    });
+}).then(function() {
+    return createVideo().then(function(video) {
+        return checkInvalidRange(video, 'video');
+    });
+}).then(function() {
+    return createCanvas().then(function(canvas) {
+        return checkInvalidRange(canvas, 'canvas');
+    });
+}).then(function() {
+    return createCanvas().then(function(canvas) {
+        return checkInvalidRange(canvas.getContext('2d'), 'canvas context');
+    });
+}).then(function() {
+    return createCanvas().then(function(canvas) {
+        var imagedata = canvas.getContext('2d').getImageData(0, 0, canvas.width, canvas.height);
+        return checkInvalidRange(imagedata, 'canvas imagedata')
+    });
+}).then(function() {
+    return createImage().then(function(image) {
+        return createImageBitmap(image);
+    }).then(function(bitmap) {
+        return checkInvalidRange(bitmap, 'image bitmap');
+    });
+}).then(function() {
+    return createBlob('resources/pattern.png').then(function(blob) {
+        return checkInvalidRange(blob, 'blob');
+    });
+}).then(function() {
+    return createBlob('resources/shadow-offset.js').then(function(blob) {
+        return shouldBeRejected(createImageBitmap(blob), 'invalid blob');
+    });
+}).then(function() {
+    return createInvalidCanvas().then(function(invalidCanvas) {
+        return shouldBeRejected(createImageBitmap(invalidCanvas), 'invalid canvas');
+    });
+}).catch(function(e) {
+    testFailed('Unexpected rejection: ' + e);
+}).then(finishJSTest, finishJSTest);
 
-        createImageBitmap(invalidCanvas).then(function() {
-            finishIfDone();
-        }, function() {
-            invalidCanvasTestPassed = true;
-            finishIfDone();
-        });
-        }
-}
 </script>
 </body>
 </html>

third_party/WebKit/LayoutTests/fast/canvas/resources/canvas-createImageBitmap-invalid-args-in-workers.js

@@ -4,12 +4,30 @@ self.jsTestIsAsync = true;
 
 description('Test createImageBitmap with invalid arguments in workers.');
 
+var reason;
+
+function shouldBeRejected(promise, message) {
+    return promise.then(function() {
+        testFailed('Resolved unexpectedly: ' + message);
+    }, function(e) {
+        reason = e;
+        testPassed('Rejected as expected: ' + message);
+        shouldBeTrue('reason instanceof Error');
+        debug(String(e));
+    });
+}
+
 var data;
 
 self.addEventListener('message', function(e) {
-  data = e.data;
-  shouldThrow("createImageBitmap(null, 0, 0, 10, 10)");
-  shouldThrow("createImageBitmap(data, 0, 0, 10, 0)");
-  shouldThrow("createImageBitmap(data, 0, 0, 0, 10)");
-  finishJSTest();
+    data = e.data;
+    Promise.resolve().then(function() {
+        return shouldBeRejected(createImageBitmap(null, 0, 0, 10, 10), 'null');
+    }).then(function() {
+        return shouldBeRejected(createImageBitmap(data, 0, 0, 10, 0), 'invalid area');
+    }).then(function() {
+        return shouldBeRejected(createImageBitmap(data, 0, 0, 0, 10), 'invalid area');
+    }).catch(function(e) {
+        testFailed('Unexpected rejection: ' + e);
+    }).then(finishJSTest, finishJSTest);
 });

third_party/WebKit/LayoutTests/http/tests/security/cross-origin-createImageBitmap-expected.txt

@@ -3,8 +3,12 @@ The image bitmap factories should throw exceptions on cross-origin access.
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS createImageBitmap(img, 0, 0, 10, 10) threw exception SecurityError: Failed to execute 'createImageBitmap' on 'Window': Cross-origin access to the source image is denied..
-PASS createImageBitmap(vid, 0, 0, 10, 10) threw exception SecurityError: Failed to execute 'createImageBitmap' on 'Window': Cross-origin access to the source video is denied..
+PASS Rejected as expected: image
+PASS reason instanceof Error is true
+SecurityError: Failed to execute 'createImageBitmap' on 'Window': Cross-origin access to the source image is denied.
+PASS Rejected as expected: video
+PASS reason instanceof Error is true
+SecurityError: Failed to execute 'createImageBitmap' on 'Window': Cross-origin access to the source video is denied.
 PASS successfullyParsed is true
 
 TEST COMPLETE

third_party/WebKit/LayoutTests/http/tests/security/cross-origin-createImageBitmap.html

 <!DOCTYPE html>
 <html>
 <body>
-    <script src="/js-test-resources/js-test.js"></script>
-    <script>
-        description("The image bitmap factories should throw exceptions on cross-origin access.");
+<script src="/js-test-resources/js-test.js"></script>
+<script>
+description("The image bitmap factories should throw exceptions on cross-origin access.");
 
-        window.jsTestIsAsync = true;
+window.jsTestIsAsync = true;
+var reason;
 
-        var img = document.createElement('img');
-        var vid = document.createElement('video');
+function shouldBeRejected(promise, message) {
+    return promise.then(function() {
+        testFailed('Resolved unexpectedly: ' + message);
+    }, function(e) {
+        reason = e;
+        testPassed('Rejected as expected: ' + message);
+        shouldBeTrue('reason instanceof Error');
+        debug(e);
+    });
+}
 
-        document.body.appendChild(img);
-        img.src = 'http://localhost:8080/security/resources/abe.png';
-        img.addEventListener('load', function () {
-            shouldThrow('createImageBitmap(img, 0, 0, 10, 10)', '"SecurityError: Failed to execute \'createImageBitmap\' on \'Window\': Cross-origin access to the source image is denied."');
-
-            vid.src = 'http://localhost:8080/media/resources/load-video.php?name=test.ogv&amp;type=video/ogv';
-            vid.addEventListener('playing', function () {
-                shouldThrow('createImageBitmap(vid, 0, 0, 10, 10)', '"SecurityError: Failed to execute \'createImageBitmap\' on \'Window\': Cross-origin access to the source video is denied."');
-                finishJSTest();
-            });
-            document.body.appendChild(vid);
-            vid.play();
-        });
-    </script>
+Promise.resolve().then(function() {
+    return new Promise(function(resolve, reject) {
+        var image = document.createElement('img');
+        image.addEventListener('load', resolve.bind(undefined, image));
+        image.src = 'http://localhost:8080/security/resources/abe.png';
+        document.body.appendChild(image);
+    }).then(function(image) {
+        return shouldBeRejected(createImageBitmap(image, 0, 0, 10, 10), 'image');
+    });
+}).then(function() {
+    return new Promise(function(resolve, reject) {
+        var video = document.createElement('video');
+        video.src = 'http://localhost:8080/media/resources/load-video.php?name=test.ogv&amp;type=video/ogv';
+        video.addEventListener('playing', resolve.bind(undefined, video));
+        document.body.appendChild(video);
+        video.play();
+    }).then(function(video) {
+        return shouldBeRejected(createImageBitmap(video, 0, 0, 10, 10), 'video');
+    });
+}).catch(function(e) {
+    testFailed('Unexpected rejection: ' + e);
+}).then(finishJSTest, finishJSTest);
+</script>
 </body>
 </html>

third_party/WebKit/LayoutTests/storage/quota/storagequota-query-info-expected.txt

@@ -10,9 +10,9 @@ PASS quota is >= usage
 PASS usage is >= 0
 PASS quota is >= usage
 * Querying about unknown storage.
-PASS navigator.storageQuota.queryInfo('unknown') threw exception TypeError: Failed to execute 'queryInfo' on 'StorageQuota': parameter 1 ('unknown') is not a valid enum value..
+PASS rejected as expected: TypeError: Failed to execute 'queryInfo' on 'StorageQuota': parameter 1 ('unknown') is not a valid enum value.
 * Querying with missing storage type.
-PASS navigator.storageQuota.queryInfo() threw exception TypeError: Failed to execute 'queryInfo' on 'StorageQuota': 1 argument required, but only 0 present..
+PASS rejected as expected: TypeError: Failed to execute 'queryInfo' on 'StorageQuota': 1 argument required, but only 0 present.
 Finished running tests.
 PASS successfullyParsed is true
 

third_party/WebKit/LayoutTests/storage/quota/storagequota-query-info.html

@@ -46,14 +46,20 @@ function runQueryPersistentTest() {
 
 function runQueryUnknownTest() {
     debug("* Querying about unknown storage.");
-    shouldThrow("navigator.storageQuota.queryInfo('unknown')");
-    runNextTest();
+    navigator.storageQuota.queryInfo('unknown').then(function() {
+        testFailed('resolved unexpectedly');
+    }, function(e) {
+        testPassed('rejected as expected: ' + e);
+    }).then(runNextTest);
 }
 
 function runQueryWithMissingArgumentTest() {
     debug("* Querying with missing storage type.");
-    shouldThrow("navigator.storageQuota.queryInfo()");
-    runNextTest();
+    navigator.storageQuota.queryInfo().then(function() {
+        testFailed('resolved unexpectedly');
+    }, function(e) {
+        testPassed('rejected as expected: ' + e);
+    }).then(runNextTest);
 }
 
 // End of test body functions ---------------------------------------------

third_party/WebKit/LayoutTests/storage/quota/storagequota-request-persistent-quota-expected.txt

@@ -7,7 +7,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 PASS usage is >= 0
 PASS grantedQuota is non-zero.
 * Requesting persistent quota with missing argument.
-PASS navigator.storageQuota.requestPersistentQuota() threw exception TypeError: Failed to execute 'requestPersistentQuota' on 'StorageQuota': 1 argument required, but only 0 present..
+PASS rejected as expected: TypeError: Failed to execute 'requestPersistentQuota' on 'StorageQuota': 1 argument required, but only 0 present.
 * Requesting persistent quota with negative value.
 PASS usage is >= 0
 PASS grantedQuota is 0

third_party/WebKit/LayoutTests/storage/quota/storagequota-request-persistent-quota.html

@@ -32,8 +32,11 @@ function runRequestQuotaTest() {
 
 function runRequestQuotaWithMisingArgumentTest() {
     debug("* Requesting persistent quota with missing argument.");
-    shouldThrow("navigator.storageQuota.requestPersistentQuota()");
-    runNextTest();
+    navigator.storageQuota.requestPersistentQuota().then(function() {
+        testFailed('resolved unexpectedly');
+    }, function(e) {
+        testPassed('rejected as expected: ' + e);
+    }).then(runNextTest);
 }
 
 function runRequestQuotaWithNegativeValueTest() {