chrome/android/javatests/src/org/chromium/chrome/browser/NavigationPopupTest.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/NavigationPopupTest.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/java/src/org/chromium/chrome/browser/Tab.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/RepostFormWarningTest.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/NavigationPopupTest.java

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

index d6531f71ee12cf96138ec7adc0f83d26eeba9ee2..8fdd89afab826608c3ac8d34a5ca5e97a7ed0492 100644

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

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

@@ -11,8 +11,8 @@ import android.test.suitebuilder.annotation.SmallTest;

import org.chromium.base.ThreadUtils;

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

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

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

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

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

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

import org.chromium.content.browser.NavigationClient;

import org.chromium.content.browser.NavigationEntry;

import org.chromium.content.browser.NavigationHistory;

@@ -25,17 +25,17 @@ import java.util.concurrent.ExecutionException;

/**

* Tests for the navigation popup.

-public class NavigationPopupTest extends ChromiumTestShellTestBase {

+public class NavigationPopupTest extends ChromeShellTestBase {

private static final int INVALID_NAVIGATION_INDEX = -1;

- private ChromiumTestShellActivity mActivity;

+ private ChromeShellActivity mActivity;

@Override

public void setUp() throws Exception {

super.setUp();

- mActivity = launchChromiumTestShellWithBlankPage();

+ mActivity = launchChromeShellWithBlankPage();

}

// Exists solely to expose protected methods to this test.