Index: third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/timeout-clear-watch.js |
diff --git a/third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/timeout-clear-watch.js b/third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/timeout-clear-watch.js |
index 6f3d318b06e22e9b7cec72c12fd524dd3ee44ab1..d4ecad06e6b2cbde60baaed9569d465bb0a541fc 100644 |
--- a/third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/timeout-clear-watch.js |
+++ b/third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/timeout-clear-watch.js |
@@ -1,24 +1,25 @@ |
description("Tests that when a watch times out and is cleared from the error callback, there is no crash. This a regression test for https://bugs.webkit.org/show_bug.cgi?id=32111."); |
-if (!window.testRunner || !window.internals) |
- debug('This test can not run without testRunner or internals'); |
- |
-internals.setGeolocationClientMock(document); |
-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; |
-var watchId = navigator.geolocation.watchPosition(function() { |
- testFailed('Success callback invoked unexpectedly'); |
- finishJSTest(); |
-}, function(e) { |
- error = e; |
- shouldBe('error.code', 'error.TIMEOUT'); |
- shouldBe('error.message', '"Timeout expired"'); |
- navigator.geolocation.clearWatch(watchId); |
- window.setTimeout(finishJSTest, 0); |
-}, { |
- timeout: 0 |
-}); |
+geolocationServiceMock.then(mock => { |
+ mock.setGeolocationPosition(51.478, -0.166, 100.0); |
+ |
+ var watchId = navigator.geolocation.watchPosition(function() { |
+ testFailed('Success callback invoked unexpectedly'); |
+ finishJSTest(); |
+ }, function(e) { |
+ error = e; |
+ shouldBe('error.code', 'error.TIMEOUT'); |
+ shouldBe('error.message', '"Timeout expired"'); |
+ navigator.geolocation.clearWatch(watchId); |
+ window.setTimeout(finishJSTest, 0); |
+ }, { |
+ timeout: 0 |
+ }); |
+}); |
window.jsTestIsAsync = true; |