chrome/android/javatests/src/org/chromium/chrome/browser/test/ModalDialogTest.java - Issue 73173002: Add ContextMenu support upstream for Android

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 73173002: Add ContextMenu support upstream for Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 7 years 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/contextmenu/ContextMenuTest.java ('k') | chrome/android/testshell/java/src/org/chromium/chrome/testshell/ChromiumTestShellActivity.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 beb56fd20807c2425171ac200e2af4676a9a1ff2..3fa08b7b00835fda0cc282ff96e4ce4820930b71 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

@@ -18,9 +18,9 @@ import org.chromium.base.test.util.DisabledTest;

import org.chromium.base.test.util.Feature;

import org.chromium.base.test.util.UrlUtils;

import org.chromium.chrome.browser.JavascriptAppModalDialog;

+import org.chromium.chrome.test.util.TabBaseTabUtils;

+import org.chromium.chrome.test.util.TabBaseTabUtils.TestCallbackHelperContainerForTab;

import org.chromium.chrome.testshell.ChromiumTestShellTestBase;

-import org.chromium.chrome.testshell.TabShellTabUtils;

-import org.chromium.chrome.testshell.TabShellTabUtils.TestCallbackHelperContainerForTab;

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

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

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

@@ -419,6 +419,6 @@ public class ModalDialogTest extends ChromiumTestShellTestBase {

}

private TestCallbackHelperContainerForTab getActiveTabTestCallbackHelperContainer() {

- return TabShellTabUtils.getTestCallbackHelperContainer(getActivity().getActiveTab());

+ return TabBaseTabUtils.getTestCallbackHelperContainer(getActivity().getActiveTab());

}