chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java - Issue 572013002: Removing ContentViewCore dependencies from direct WebContents functions.

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: chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java

Issue 572013002: Removing ContentViewCore dependencies from direct WebContents functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed nits. Created 6 years, 2 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

« android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java ('K') | « chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectFileDialogTest.java ('k') | chrome/android/sync_shell/javatests/src/chromium/chrome/browser/sync/SyncTest.java » ('j') | components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java

index e2242301e753f08e2604b7c791c5ec05fda71593..3eb42e6c7aa83f85efbcaefb4f7a364e88d0af93 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java

@@ -265,7 +265,7 @@ public class ModalDialogTest extends ChromeShellTestBase {

clickCancel(jsDialog);

scriptEvent.waitUntilHasValue();

- scriptEvent.evaluateJavaScript(getActivity().getActiveContentViewCore(),

+ scriptEvent.evaluateJavaScript(getActivity().getActiveContentViewCore().getWebContents(),

"alert('Android');");

assertTrue("No further dialog boxes should be shown.", scriptEvent.waitUntilHasValue());

}

@@ -310,7 +310,7 @@ public class ModalDialogTest extends ChromeShellTestBase {

private OnEvaluateJavaScriptResultHelper executeJavaScriptAndWaitForDialog(

final OnEvaluateJavaScriptResultHelper helper, String script)

throws InterruptedException {

- helper.evaluateJavaScript(getActivity().getActiveContentViewCore(),

+ helper.evaluateJavaScript(getActivity().getActiveContentViewCore().getWebContents(),

script);

boolean criteriaSatisfied = CriteriaHelper.pollForCriteria(

new JavascriptAppModalDialogShownCriteria(true));