chrome/android/javatests/src/org/chromium/chrome/browser/test/ProviderTestBase.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/test/ProviderTestBase.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/test/ProviderBookmarkNodeTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/translate/TranslateInfoBarTest.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/ProviderTestBase.java

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

index c98e6128d38d2ff422d9a037d0140c416a95a307..5f776a2f3058d95e3132c15d22a7cf2bf6551fc8 100644

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

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

@@ -10,14 +10,14 @@ import android.test.IsolatedContext;

import android.test.mock.MockContentResolver;

import org.chromium.chrome.browser.ChromeBrowserProvider;

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

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

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

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

/**

* Base class for Chrome's ContentProvider tests.

* Sets up a local ChromeBrowserProvider associated to a mock resolver in an isolated context.

-public class ProviderTestBase extends ChromiumTestShellTestBase {

+public class ProviderTestBase extends ChromeShellTestBase {

private IsolatedContext mContext;

@@ -25,7 +25,7 @@ public class ProviderTestBase extends ChromiumTestShellTestBase {

protected void setUp() throws Exception {

super.setUp();

- ChromiumTestShellActivity activity = launchChromiumTestShellWithUrl(null);

+ ChromeShellActivity activity = launchChromeShellWithUrl(null);

assertNotNull(activity);

ContentProvider provider = new ChromeBrowserProvider();