content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.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/NavigationTest.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/javatests/src/org/chromium/content/browser/JavaBridgeChildFrameTest.java ('k') | content/public/android/javatests/src/org/chromium/content/browser/TestsJavaScriptEvalTest.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/NavigationTest.java

diff --git a/content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.java b/content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.java

index 32d8d24afb925af63d0d2972713ed252402c2ec8..ae0ab89b8cd5212cd3fc6bf39a4007076f3dce2d 100644

--- a/content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.java

+++ b/content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.java

@@ -118,7 +118,8 @@ public class NavigationTest extends ContentShellTestBase {

OnEvaluateJavaScriptResultHelper javascriptHelper = new OnEvaluateJavaScriptResultHelper();

// Grab the first timestamp.

- javascriptHelper.evaluateJavaScript(contentViewCore.getWebContents(), "getLoadtime();");

+ javascriptHelper.evaluateJavaScriptForTests(

+ contentViewCore.getWebContents(), "getLoadtime();");

javascriptHelper.waitUntilHasValue();

String firstTimestamp = javascriptHelper.getJsonResultAndClear();

assertNotNull("Timestamp was null.", firstTimestamp);

@@ -126,7 +127,8 @@ public class NavigationTest extends ContentShellTestBase {

// Grab the timestamp after a reload and make sure they don't match.

reload(contentViewCore.getWebContents().getNavigationController(),

testCallbackHelperContainer);

- javascriptHelper.evaluateJavaScript(contentViewCore.getWebContents(), "getLoadtime();");

+ javascriptHelper.evaluateJavaScriptForTests(

+ contentViewCore.getWebContents(), "getLoadtime();");

javascriptHelper.waitUntilHasValue();

String secondTimestamp = javascriptHelper.getJsonResultAndClear();

assertNotNull("Timestamp was null.", secondTimestamp);