content/public/android/javatests/src/org/chromium/content/browser/ContentViewLocationTest.java - Issue 1258593002: Reland "Add ExecuteJavaScriptForTest and make all tests use it"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1258593002: Reland "Add ExecuteJavaScriptForTest and make all tests use it" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix 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

« content/browser/frame_host/render_frame_host_impl.cc ('K') | « content/public/android/java/src/org/chromium/content_public/browser/WebContents.java ('k') | content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBareboneTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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();