Index: third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/multiple-requests.js |
diff --git a/third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/multiple-requests.js b/third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/multiple-requests.js |
index 933e153b5d8281217f7b855c1e720c8a3dc4f7d3..71d9da47c29e9267404f46e338a894093d053be9 100644 |
--- a/third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/multiple-requests.js |
+++ b/third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/multiple-requests.js |
@@ -4,42 +4,43 @@ var mockLatitude = 51.478; |
var mockLongitude = -0.166; |
var mockAccuracy = 100; |
-if (!window.testRunner || !window.internals) |
- debug('This test can not run without testRunner or internals'); |
- |
-internals.setGeolocationClientMock(document); |
-internals.setGeolocationPermission(document, true); |
-internals.setGeolocationPosition(document, mockLatitude, mockLongitude, mockAccuracy); |
+if (!window.testRunner || !window.mojo) |
+ debug('This test can not run without testRunner or mojo'); |
+var position; |
var watchCallbackInvoked = false; |
var oneShotCallbackInvoked = false; |
-navigator.geolocation.watchPosition(function(p) { |
- shouldBeFalse('watchCallbackInvoked'); |
- watchCallbackInvoked = true; |
- maybeFinishTest(p); |
-}, function() { |
- testFailed('Error callback invoked unexpectedly'); |
- finishJSTest(); |
-}); |
- |
-navigator.geolocation.getCurrentPosition(function(p) { |
- shouldBeFalse('oneShotCallbackInvoked'); |
- oneShotCallbackInvoked = true; |
- maybeFinishTest(p); |
-}, function() { |
- testFailed('Error callback invoked unexpectedly'); |
- finishJSTest(); |
-}); |
+geolocationServiceMock.then(mock => { |
+ mock.setGeolocationPermission(true); |
+ mock.setGeolocationPosition(mockLatitude, mockLongitude, mockAccuracy); |
-var position; |
-function maybeFinishTest(p) { |
- position = p; |
- shouldBe('position.coords.latitude', 'mockLatitude'); |
- shouldBe('position.coords.longitude', 'mockLongitude'); |
- shouldBe('position.coords.accuracy', 'mockAccuracy'); |
- if (watchCallbackInvoked && oneShotCallbackInvoked) |
+ navigator.geolocation.watchPosition(function(p) { |
+ shouldBeFalse('watchCallbackInvoked'); |
+ watchCallbackInvoked = true; |
+ maybeFinishTest(p); |
+ }, function() { |
+ testFailed('Error callback invoked unexpectedly'); |
finishJSTest(); |
-} |
+ }); |
+ |
+ navigator.geolocation.getCurrentPosition(function(p) { |
+ shouldBeFalse('oneShotCallbackInvoked'); |
+ oneShotCallbackInvoked = true; |
+ maybeFinishTest(p); |
+ }, function() { |
+ testFailed('Error callback invoked unexpectedly'); |
+ finishJSTest(); |
+ }); |
+ |
+ function maybeFinishTest(p) { |
+ position = p; |
+ shouldBe('position.coords.latitude', 'mockLatitude'); |
+ shouldBe('position.coords.longitude', 'mockLongitude'); |
+ shouldBe('position.coords.accuracy', 'mockAccuracy'); |
+ if (watchCallbackInvoked && oneShotCallbackInvoked) |
+ finishJSTest(); |
+ } |
+}); |
window.jsTestIsAsync = true; |