chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java - Issue 251443004: ContentView->ContentViewCore.getContainerView in chrome/ tests

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 251443004: ContentView->ContentViewCore.getContainerView in chrome/ tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 8 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 | « chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillTest.java ('k') | chrome/android/shell/java/src/org/chromium/chrome/shell/ChromeShellActivity.java » ('j') | no next file with comments »
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 3eaaec204b7dad463cf11a7a7e8e330ee3a87e32..bb2b6084be17759fb62429f99e7f3f80e56d6189 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

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

clickCancel(jsDialog);

scriptEvent.waitUntilHasValue();

- scriptEvent.evaluateJavaScript(getActivity().getActiveContentView().getContentViewCore(),

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

"alert('Android');");

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

}

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

private OnEvaluateJavaScriptResultHelper executeJavaScriptAndWaitForDialog(

final OnEvaluateJavaScriptResultHelper helper, String script)

throws InterruptedException {

- helper.evaluateJavaScript(getActivity().getActiveContentView().getContentViewCore(),

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

script);

boolean criteriaSatisfied = CriteriaHelper.pollForCriteria(

new JavascriptAppModalDialogShownCriteria(true));