| Index: third_party/WebKit/LayoutTests/fast/dom/Geolocation/delayed-permission-allowed-for-multiple-requests.html
|
| diff --git a/third_party/WebKit/LayoutTests/fast/dom/Geolocation/delayed-permission-allowed-for-multiple-requests.html b/third_party/WebKit/LayoutTests/fast/dom/Geolocation/delayed-permission-allowed-for-multiple-requests.html
|
| index e37525a5910a7af46a56d8b126574c5683261134..7c0afd99621e3ae828a036ff09ecb98d9e50554a 100644
|
| --- a/third_party/WebKit/LayoutTests/fast/dom/Geolocation/delayed-permission-allowed-for-multiple-requests.html
|
| +++ b/third_party/WebKit/LayoutTests/fast/dom/Geolocation/delayed-permission-allowed-for-multiple-requests.html
|
| @@ -6,6 +6,59 @@
|
| <script src="resources/geolocation-mock.js"></script>
|
| </head>
|
| <body>
|
| -<script src="script-tests/delayed-permission-allowed-for-multiple-requests.js"></script>
|
| +<script>
|
| +description("Tests that when multiple requests are waiting for permission, no callbacks are invoked until permission is allowed.");
|
| +
|
| +geolocationServiceMock.then(mock => {
|
| + mock.setGeolocationPosition(51.478, -0.166, 100);
|
| +
|
| + var permissionSet = false;
|
| +
|
| + function allowPermission() {
|
| + permissionSet = true;
|
| + mock.setGeolocationPermission(true);
|
| + }
|
| +
|
| + var watchCallbackInvoked = false;
|
| + var oneShotCallbackInvoked = false;
|
| +
|
| + navigator.geolocation.watchPosition(function() {
|
| + if (permissionSet) {
|
| + testPassed('Success callback invoked');
|
| + watchCallbackInvoked = true;
|
| + maybeFinishTest();
|
| + return;
|
| + }
|
| + testFailed('Success callback invoked unexpectedly');
|
| + finishJSTest();
|
| + }, function(err) {
|
| + testFailed('Error callback invoked unexpectedly');
|
| + finishJSTest();
|
| + });
|
| +
|
| + navigator.geolocation.getCurrentPosition(function() {
|
| + if (permissionSet) {
|
| + testPassed('Success callback invoked');
|
| + oneShotCallbackInvoked = true;
|
| + maybeFinishTest();
|
| + return;
|
| + }
|
| + testFailed('Success callback invoked unexpectedly');
|
| + finishJSTest();
|
| + }, function(err) {
|
| + testFailed('Error callback invoked unexpectedly');
|
| + finishJSTest();
|
| + });
|
| +
|
| + window.setTimeout(allowPermission, 100);
|
| +
|
| + function maybeFinishTest() {
|
| + if (watchCallbackInvoked && oneShotCallbackInvoked)
|
| + finishJSTest();
|
| + }
|
| +});
|
| +
|
| +window.jsTestIsAsync = true;
|
| +</script>
|
| </body>
|
| </html>
|
|
|
Chromium Code Reviews
Issue 2667393002:
Stop using script-tests in fast/dom/. (Closed)
