chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectPopupOtherContentViewTest.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/input/SelectPopupOtherContentViewTest.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/infobar/InfoBarTest.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/prerender/ExternalPrerenderRequestTest.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/input/SelectPopupOtherContentViewTest.java

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

index b74b310b4148c7e31462d77c78f97aefc993605c..cc15e249fa6e94dde699353f6b97bb1d5a49fd67 100644

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

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

@@ -7,7 +7,7 @@ package org.chromium.chrome.browser.input;

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

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

import org.chromium.chrome.browser.ContentViewUtil;

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

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

import org.chromium.content.browser.ContentView;

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

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

@@ -17,7 +17,7 @@ import org.chromium.content.browser.test.util.UiUtils;

import org.chromium.ui.base.ActivityWindowAndroid;

import org.chromium.ui.base.WindowAndroid;

-public class SelectPopupOtherContentViewTest extends ChromiumTestShellTestBase {

+public class SelectPopupOtherContentViewTest extends ChromeShellTestBase {

private static final String SELECT_URL = UrlUtils.encodeHtmlDataUri(

"<html><body>" +

"Which animal is the strongest:<br/>" +

@@ -55,7 +55,7 @@ public class SelectPopupOtherContentViewTest extends ChromiumTestShellTestBase {

public void testPopupNotClosedByOtherContentView()

throws InterruptedException, Exception, Throwable {

// Load the test page.

- launchChromiumTestShellWithUrl(SELECT_URL);

+ launchChromeShellWithUrl(SELECT_URL);

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

final ContentView view = getActivity().getActiveContentView();