chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuTest.java - Issue 184993005: Rename ChromiumTestShell classes to ChromeShell.

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/contextmenu/ContextMenuTest.java

Issue 184993005: Rename ChromiumTestShell classes to ChromeShell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase yet again Created 6 years, 10 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/banners/InstallerDelegateTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarTest.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/contextmenu/ContextMenuTest.java

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuTest.java

index aaf181f8f6cc6a8f9d7cd22a8122331580fe4546..523e67114381ef30b5e9ca09acfbf53cde1d8e78 100644

--- a/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuTest.java

+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuTest.java

@@ -16,7 +16,7 @@ import junit.framework.Assert;

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

import org.chromium.chrome.R;

import org.chromium.chrome.browser.Tab;

-import org.chromium.chrome.shell.ChromiumTestShellTestBase;

+import org.chromium.chrome.shell.ChromeShellTestBase;

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

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

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

@@ -30,11 +30,11 @@ import org.chromium.content.browser.test.util.TestTouchUtils;

import java.util.concurrent.TimeoutException;

import java.util.concurrent.atomic.AtomicReference;

-public class ContextMenuTest extends ChromiumTestShellTestBase {

+public class ContextMenuTest extends ChromeShellTestBase {

@Override

public void setUp() throws Exception {

super.setUp();

- launchChromiumTestShellWithUrl(TestHttpServerClient.getUrl(

+ launchChromeShellWithUrl(TestHttpServerClient.getUrl(

"chrome/test/data/android/contextmenu/context_menu_test.html"));

assertTrue("Page failed to load", waitForActiveShellToBeDoneLoading());

assertWaitForPageScaleFactorMatch(0.5f);