| Index: third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-already-error.js
|
| diff --git a/third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-already-error.js b/third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-already-error.js
|
| index 252d4128a229bcd6b8b6ceb302dc79d430cfc729..ed00f4803549922b65f7401702d7d42cfed2723b 100644
|
| --- a/third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-already-error.js
|
| +++ b/third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/permission-denied-already-error.js
|
| @@ -1,28 +1,13 @@
|
| description("Tests that when Geolocation permission has been denied prior to a call to a Geolocation method, the error callback is invoked with code PERMISSION_DENIED, when the Geolocation service encounters an error.");
|
|
|
| -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);
|
| +if (!window.testRunner || !window.mojo)
|
| + debug('This test can not run without testRunner or mojo');
|
|
|
| var error;
|
| -navigator.geolocation.getCurrentPosition(function(p) {
|
| - testFailed('Success callback invoked unexpectedly');
|
| - finishJSTest();
|
| -}, function(e) {
|
| - error = e;
|
| - shouldBe('error.code', 'error.PERMISSION_DENIED');
|
| - shouldBe('error.message', '"User denied Geolocation"');
|
| - debug('');
|
| - continueTest();
|
| -});
|
|
|
| -function continueTest()
|
| -{
|
| - // Make another request, with permission already denied.
|
| - internals.setGeolocationPositionUnavailableError(document, 'test');
|
| +geolocationServiceMock.then(mock => {
|
| + mock.setGeolocationPermission(false);
|
| + mock.setGeolocationPosition(51.478, -0.166, 100);
|
|
|
| navigator.geolocation.getCurrentPosition(function(p) {
|
| testFailed('Success callback invoked unexpectedly');
|
| @@ -31,8 +16,25 @@ function continueTest()
|
| error = e;
|
| shouldBe('error.code', 'error.PERMISSION_DENIED');
|
| shouldBe('error.message', '"User denied Geolocation"');
|
| - finishJSTest();
|
| + debug('');
|
| + continueTest();
|
| });
|
| -}
|
| +
|
| + function continueTest()
|
| + {
|
| + // Make another request, with permission already denied.
|
| + mock.setGeolocationPositionUnavailableError('test');
|
| +
|
| + navigator.geolocation.getCurrentPosition(function(p) {
|
| + testFailed('Success callback invoked unexpectedly');
|
| + finishJSTest();
|
| + }, function(e) {
|
| + error = e;
|
| + shouldBe('error.code', 'error.PERMISSION_DENIED');
|
| + shouldBe('error.message', '"User denied Geolocation"');
|
| + finishJSTest();
|
| + });
|
| + }
|
| +});
|
|
|
| window.jsTestIsAsync = true;
|
|
|