content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java - Issue 1257603003: Revert of 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/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java

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

Patch Set: 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 | « content/browser/web_contents/web_contents_android.cc ('k') | content/public/android/java/src/org/chromium/content_public/browser/WebContents.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java

diff --git a/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java b/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java

index 0f23bcda766c332bec3cbf16673ac8da8b5e75e6..d4530f9d462c853ca053f181e5aef64104083787 100644

--- a/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java

+++ b/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java

@@ -293,14 +293,9 @@

}

@Override

+ @VisibleForTesting

public void evaluateJavaScript(String script, JavaScriptCallback callback) {

nativeEvaluateJavaScript(mNativeWebContentsAndroid, script, callback);

- }

- @Override

- @VisibleForTesting

- public void evaluateJavaScriptForTests(String script, JavaScriptCallback callback) {

- nativeEvaluateJavaScriptForTests(mNativeWebContentsAndroid, script, callback);

}

@Override

@@ -426,8 +421,6 @@

private native void nativeResumeLoadingCreatedWebContents(long nativeWebContentsAndroid);

private native void nativeEvaluateJavaScript(long nativeWebContentsAndroid,

String script, JavaScriptCallback callback);

- private native void nativeEvaluateJavaScriptForTests(long nativeWebContentsAndroid,

- String script, JavaScriptCallback callback);

private native void nativeAddMessageToDevToolsConsole(

long nativeWebContentsAndroid, int level, String message);

private native boolean nativeHasAccessedInitialDocument(