android_webview/javatests/src/org/chromium/android_webview/test/GeolocationTest.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: android_webview/javatests/src/org/chromium/android_webview/test/GeolocationTest.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

« no previous file with comments | « android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/util/JSUtils.java » ('j') | content/browser/frame_host/render_frame_host_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/javatests/src/org/chromium/android_webview/test/GeolocationTest.java

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/GeolocationTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/GeolocationTest.java

index 98f45f7a8b82093c6f8b131f04efd376241ae023..23beb13d4c46263b9a43be37faf396fdbf798c93 100644

--- a/android_webview/javatests/src/org/chromium/android_webview/test/GeolocationTest.java

+++ b/android_webview/javatests/src/org/chromium/android_webview/test/GeolocationTest.java

@@ -113,7 +113,7 @@ public class GeolocationTest extends AwTestBase {

loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),

RAW_HTML, "text/html", false);

- mAwContents.evaluateJavaScript("initiate_getCurrentPosition();", null);

+ mAwContents.evaluateJavaScriptForTests("initiate_getCurrentPosition();", null);

poll(new Callable<Boolean>() {

@Override

@@ -122,7 +122,7 @@ public class GeolocationTest extends AwTestBase {

}

});

- mAwContents.evaluateJavaScript("initiate_getCurrentPosition();", null);

+ mAwContents.evaluateJavaScriptForTests("initiate_getCurrentPosition();", null);

poll(new Callable<Boolean>() {

@Override

public Boolean call() throws Exception {

@@ -140,7 +140,7 @@ public class GeolocationTest extends AwTestBase {

loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),

RAW_HTML, "text/html", false);

- mAwContents.evaluateJavaScript("initiate_watchPosition();", null);

+ mAwContents.evaluateJavaScriptForTests("initiate_watchPosition();", null);

poll(new Callable<Boolean>() {

@Override

@@ -157,7 +157,7 @@ public class GeolocationTest extends AwTestBase {

loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),

RAW_HTML, "text/html", false);

- mAwContents.evaluateJavaScript("initiate_watchPosition();", null);

+ mAwContents.evaluateJavaScriptForTests("initiate_watchPosition();", null);

poll(new Callable<Boolean>() {

@Override

@@ -215,7 +215,7 @@ public class GeolocationTest extends AwTestBase {

loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),

RAW_HTML, "text/html", false);

- mAwContents.evaluateJavaScript("initiate_watchPosition();", null);

+ mAwContents.evaluateJavaScriptForTests("initiate_watchPosition();", null);

assertEquals(0, getPositionCountFromJS());