Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(414)

Unified Diff: content/public/android/javatests/src/org/chromium/content/browser/ContentViewLocationTest.java

Issue 1123783002: Add ExecuteJavaScriptForTest and make all tests use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/public/android/javatests/src/org/chromium/content/browser/ContentViewLocationTest.java
diff --git a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewLocationTest.java b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewLocationTest.java
index 91d2d043c6072ba849d9eee6e2492b66760bef42..3d76ef29443a98f6e36a9a6e2e68b1024c4e7137 100644
--- a/content/public/android/javatests/src/org/chromium/content/browser/ContentViewLocationTest.java
+++ b/content/public/android/javatests/src/org/chromium/content/browser/ContentViewLocationTest.java
@@ -45,7 +45,7 @@ public class ContentViewLocationTest extends ContentShellTestBase {
}
private void pollForPositionCallback() throws Throwable {
- mJavascriptHelper.evaluateJavaScript(getWebContents(),
+ mJavascriptHelper.evaluateJavaScriptForTests(getWebContents(),
"positionCount = 0");
mJavascriptHelper.waitUntilHasValue();
assertEquals(0, Integer.parseInt(mJavascriptHelper.getJsonResultAndClear()));
@@ -53,7 +53,7 @@ public class ContentViewLocationTest extends ContentShellTestBase {
assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
@Override
public boolean isSatisfied() {
- mJavascriptHelper.evaluateJavaScript(getWebContents(), "positionCount");
+ mJavascriptHelper.evaluateJavaScriptForTests(getWebContents(), "positionCount");
try {
mJavascriptHelper.waitUntilHasValue();
} catch (Exception e) {
@@ -65,7 +65,7 @@ public class ContentViewLocationTest extends ContentShellTestBase {
}
private void startGeolocationWatchPosition() throws Throwable {
- mJavascriptHelper.evaluateJavaScript(getWebContents(),
+ mJavascriptHelper.evaluateJavaScriptForTests(getWebContents(),
"initiate_watchPosition();");
mJavascriptHelper.waitUntilHasValue();
}
@@ -116,7 +116,7 @@ public class ContentViewLocationTest extends ContentShellTestBase {
hideContentViewOnUiThread();
ensureGeolocationRunning(false);
- mJavascriptHelper.evaluateJavaScript(getWebContents(),
+ mJavascriptHelper.evaluateJavaScriptForTests(getWebContents(),
"positionCount = 0");
mJavascriptHelper.waitUntilHasValue();

Powered by Google App Engine
This is Rietveld 408576698