chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java - Issue 227803004: ContentView->ContentViewCore in ContentViewRenderView

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

Patch Set: rebase 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 | « no previous file | chrome/android/shell/java/src/org/chromium/chrome/shell/TabManager.java » ('j') | chrome/android/shell/javatests/src/org/chromium/chrome/shell/ChromeShellUrlTest.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 7106bace877370b1fdacc654bdc7ae4f240de9ce..af8960afee8946e036a7a6006399cc08c0165a14 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

@@ -21,6 +21,7 @@ import org.chromium.chrome.browser.JavascriptAppModalDialog;

import org.chromium.chrome.shell.ChromeShellTestBase;

import org.chromium.chrome.test.util.TabUtils;

import org.chromium.chrome.test.util.TabUtils.TestCallbackHelperContainerForTab;

+import org.chromium.content.browser.test.util.CallbackHelper;

import org.chromium.content.browser.test.util.Criteria;

import org.chromium.content.browser.test.util.CriteriaHelper;

import org.chromium.content.browser.test.util.TestCallbackHelperContainer;

@@ -281,7 +282,7 @@ public class ModalDialogTest extends ChromeShellTestBase {

throws InterruptedException, TimeoutException, ExecutionException {

executeJavaScriptAndWaitForDialog("alert('Android')");

- final TestCallbackHelperContainerForTab.OnCloseTabHelper onTabClosed =

+ final CallbackHelper onTabClosed =

getActiveTabTestCallbackHelperContainer().getOnCloseTabHelper();

int callCount = onTabClosed.getCallCount();

ThreadUtils.runOnUiThreadBlocking(new Runnable() {