| Index: third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/reentrant-permission-denied.js
|
| diff --git a/third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/reentrant-permission-denied.js b/third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/reentrant-permission-denied.js
|
| index f1f003021cba0102b0d3546a65113b61ba250dac..66327609ebff43170096f99ace232c0b2cfe4780 100644
|
| --- a/third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/reentrant-permission-denied.js
|
| +++ b/third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/reentrant-permission-denied.js
|
| @@ -1,41 +1,43 @@
|
| description("Tests that reentrant calls to Geolocation methods from the error callback due to a PERMISSION_DENIED error are OK.");
|
|
|
| -if (!window.testRunner || !window.internals)
|
| - debug('This test can not run without testRunner or internals');
|
| -
|
| -internals.setGeolocationClientMock(document);
|
| -internals.setGeolocationPermission(document, false);
|
| -internals.setGeolocationPosition(document, 51.478, -0.166, 100.0);
|
| +if (!window.testRunner || !window.mojo)
|
| + debug('This test can not run without testRunner or mojo');
|
|
|
| var error;
|
| -function checkPermissionError(e) {
|
| - error = e;
|
| - shouldBe('error.code', 'error.PERMISSION_DENIED');
|
| - shouldBe('error.message', '"User denied Geolocation"');
|
| -}
|
|
|
| -var errorCallbackInvoked = false;
|
| -navigator.geolocation.getCurrentPosition(function(p) {
|
| - testFailed('Success callback invoked unexpectedly');
|
| - finishJSTest();
|
| -}, function(e) {
|
| - if (errorCallbackInvoked) {
|
| - testFailed('Error callback invoked unexpectedly');
|
| - finishJSTest();
|
| +geolocationServiceMock.then(mock => {
|
| + mock.setGeolocationPermission(false);
|
| + mock.setGeolocationPosition(51.478, -0.166, 100.0);
|
| +
|
| + function checkPermissionError(e) {
|
| + error = e;
|
| + shouldBe('error.code', 'error.PERMISSION_DENIED');
|
| + shouldBe('error.message', '"User denied Geolocation"');
|
| }
|
| - errorCallbackInvoked = true;
|
| - checkPermissionError(e);
|
| - continueTest();
|
| -});
|
|
|
| -function continueTest() {
|
| + var errorCallbackInvoked = false;
|
| navigator.geolocation.getCurrentPosition(function(p) {
|
| testFailed('Success callback invoked unexpectedly');
|
| finishJSTest();
|
| }, function(e) {
|
| + if (errorCallbackInvoked) {
|
| + testFailed('Error callback invoked unexpectedly');
|
| + finishJSTest();
|
| + }
|
| + errorCallbackInvoked = true;
|
| checkPermissionError(e);
|
| - finishJSTest();
|
| + continueTest();
|
| });
|
| -}
|
| +
|
| + function continueTest() {
|
| + navigator.geolocation.getCurrentPosition(function(p) {
|
| + testFailed('Success callback invoked unexpectedly');
|
| + finishJSTest();
|
| + }, function(e) {
|
| + checkPermissionError(e);
|
| + finishJSTest();
|
| + });
|
| + }
|
| +});
|
|
|
| window.jsTestIsAsync = true;
|
|
|