}
private void pollForPositionCallback() throws Throwable {
- mJavascriptHelper.evaluateJavaScript(getContentViewCore(),
+ mJavascriptHelper.evaluateJavaScript(getWebContents(),
"positionCount = 0");
mJavascriptHelper.waitUntilHasValue();
assertEquals(0, Integer.parseInt(mJavascriptHelper.getJsonResultAndClear()));
assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
@Override
public boolean isSatisfied() {
- mJavascriptHelper.evaluateJavaScript(getContentViewCore(), "positionCount");
+ mJavascriptHelper.evaluateJavaScript(getWebContents(), "positionCount");
try {
mJavascriptHelper.waitUntilHasValue();
} catch (Exception e) {
}
private void startGeolocationWatchPosition() throws Throwable {
- mJavascriptHelper.evaluateJavaScript(getContentViewCore(),
+ mJavascriptHelper.evaluateJavaScript(getWebContents(),
"initiate_watchPosition();");
mJavascriptHelper.waitUntilHasValue();
}
@Override
protected void tearDown() throws Exception {
- mMockLocationProvider.stopUpdates();
- super.tearDown();
+ mMockLocationProvider.stopUpdates();
+ super.tearDown();
}
@MediumTest
hideContentViewOnUiThread();
ensureGeolocationRunning(false);
- mJavascriptHelper.evaluateJavaScript(getContentViewCore(),
+ mJavascriptHelper.evaluateJavaScript(getWebContents(),
"positionCount = 0");
mJavascriptHelper.waitUntilHasValue();
ensureGeolocationRunning(true);
// Navigate away and ensure that geolocation stops.
- loadUrl(getContentViewCore(), mTestCallbackHelperContainer,
- new LoadUrlParams("about:blank"));
+ loadUrl(getContentViewCore().getWebContents().getNavigationController(),
+ mTestCallbackHelperContainer, new LoadUrlParams("about:blank"));
ensureGeolocationRunning(false);
}
startGeolocationWatchPosition();
ensureGeolocationRunning(false);
- loadUrl(getContentViewCore(), mTestCallbackHelperContainer,
- new LoadUrlParams("about:blank"));
+ loadUrl(getContentViewCore().getWebContents().getNavigationController(),
+ mTestCallbackHelperContainer, new LoadUrlParams("about:blank"));
showContentViewOnUiThread();
ensureGeolocationRunning(false);
}