Index: third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/callback-exception.js |
diff --git a/third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/callback-exception.js b/third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/callback-exception.js |
index 39effa9272bb5939ee821accca5381cf798bc027..19e38ba2ee37348db4fb3bd047afe7388b7583b5 100644 |
--- a/third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/callback-exception.js |
+++ b/third_party/WebKit/LayoutTests/fast/dom/Geolocation/script-tests/callback-exception.js |
@@ -4,31 +4,32 @@ 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; |
-navigator.geolocation.getCurrentPosition(function(p) { |
- position = p; |
- shouldBe('position.coords.latitude', 'mockLatitude'); |
- shouldBe('position.coords.longitude', 'mockLongitude'); |
- shouldBe('position.coords.accuracy', 'mockAccuracy'); |
- |
- // Yield to allow for the error callback to be invoked. The timer |
- // must be started before the exception is thrown. |
- window.setTimeout(assertWeGotException, 0); |
- expectError(); |
- throw new Error('Exception in success callback'); |
-}, function(e) { |
- testFailed('Error callback invoked unexpectedly'); |
- finishJSTest(); |
+ |
+geolocationServiceMock.then(mock => { |
+ mock.setGeolocationPermission(true); |
+ mock.setGeolocationPosition(mockLatitude, |
+ mockLongitude, |
+ mockAccuracy); |
+ navigator.geolocation.getCurrentPosition(function(p) { |
+ position = p; |
+ shouldBe('position.coords.latitude', 'mockLatitude'); |
+ shouldBe('position.coords.longitude', 'mockLongitude'); |
+ shouldBe('position.coords.accuracy', 'mockAccuracy'); |
+ |
+ // Yield to allow for the error callback to be invoked. The timer |
+ // must be started before the exception is thrown. |
+ window.setTimeout(assertWeGotException, 0); |
+ expectError(); |
+ |
+ throw new Error('Exception in success callback'); |
+ }, function(e) { |
+ testFailed('Error callback invoked unexpectedly'); |
+ finishJSTest(); |
+ }); |
}); |
function assertWeGotException() |