chrome/android/javatests/src/org/chromium/chrome/browser/printing/PrintingControllerTest.java - Issue 189133005: Rename chromium_testshell target to chrome_shell_apk.

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/printing/PrintingControllerTest.java

Issue 189133005: Rename chromium_testshell target to chrome_shell_apk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 6 years, 9 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/shell/chrome_main_delegate_chrome_shell_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/javatests/src/org/chromium/chrome/browser/printing/PrintingControllerTest.java

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

index 8d730ce3f6a1b196da72e71ea52f180694814f47..6c643a7008422850b57ab9569746a99fb8e3e503 100644

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

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

@@ -17,8 +17,8 @@ import org.chromium.base.test.util.Feature;

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

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

import org.chromium.chrome.browser.printing.TabPrinter;

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

import org.chromium.chrome.shell.ChromeShellTestBase;

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

import java.io.File;

import java.io.FileInputStream;

@@ -77,7 +77,7 @@ public class PrintingControllerTest extends ChromeShellTestBase {

public void testNormalPrintingFlow() throws Throwable {

if (!ApiCompatibilityUtils.isPrintingSupported()) return;

- final TestShellTab currentTab = launchChromeShellWithUrl(URL).getActiveTab();

+ final ChromeShellTab currentTab = launchChromeShellWithUrl(URL).getActiveTab();

assertTrue(waitForActiveShellToBeDoneLoading());

final PrintingControllerImpl printingController = createControllerOnUiThread();

@@ -162,7 +162,7 @@ public class PrintingControllerTest extends ChromeShellTestBase {

}

private void startControllerOnUiThread(final PrintingControllerImpl controller,

- final TestShellTab tab) {

+ final ChromeShellTab tab) {

try {

final PrintManagerDelegate mockPrintManagerDelegate = new PrintManagerDelegate() {

@Override