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

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/ShortcutHelperTest.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/RepostFormWarningTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerTest.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/ShortcutHelperTest.java

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

index 8b52ff5802fed938fc19f5007938f931168cf271..346fb69db030c9c5f573be91dc9411b08801752f 100644

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

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

@@ -8,14 +8,14 @@ import android.content.Intent;

import android.test.FlakyTest;

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

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

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

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

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

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

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

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

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

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

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

-public class ShortcutHelperTest extends ChromiumTestShellTestBase {

+public class ShortcutHelperTest extends ChromeShellTestBase {

private static final String WEBAPP_ACTION_NAME = "WEBAPP_ACTION";

private static final String WEBAPP_TITLE = "Webapp shortcut";

@@ -39,7 +39,7 @@ public class ShortcutHelperTest extends ChromiumTestShellTestBase {

+ "<head><title>" + NORMAL_TITLE + "</title></head>"

+ "<body>Not Webapp capable</body></html>");

- private static class TestObserver implements ChromiumTestShellApplicationObserver {

+ private static class TestObserver implements ChromeShellApplicationObserver {

Intent firedIntent;

@Override

@@ -58,18 +58,18 @@ public class ShortcutHelperTest extends ChromiumTestShellTestBase {

}

- private ChromiumTestShellActivity mActivity;

+ private ChromeShellActivity mActivity;

private TestObserver mTestObserver;

@Override

public void setUp() throws Exception {

ShortcutHelper.setFullScreenAction(WEBAPP_ACTION_NAME);

- mActivity = launchChromiumTestShellWithBlankPage();

+ mActivity = launchChromeShellWithBlankPage();

// Set up the observer.

mTestObserver = new TestObserver();

- ChromiumTestShellApplication application =

- (ChromiumTestShellApplication) mActivity.getApplication();

+ ChromeShellApplication application =

+ (ChromeShellApplication) mActivity.getApplication();

application.addObserver(mTestObserver);

super.setUp();