chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java - Issue 2814533002: Adding a new annotation to set ChildProcessAllocator settings in tests.

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/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java

Issue 2814533002: Adding a new annotation to set ChildProcessAllocator settings in tests. (Closed)

Patch Set: Clean-up Created 3 years, 8 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/BindingManagerIntegrationTest.java ('k') | content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncher.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java

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

index f99706de3d29c459e876d026421d5309c00ac99f..8303e01db6d8022a712c3d39b438cd6d41a21e09 100644

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

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

@@ -13,7 +13,6 @@ import com.google.android.gms.common.ConnectionResult;

import com.google.android.gms.common.GoogleApiAvailability;

import org.chromium.base.ThreadUtils;

-import org.chromium.base.test.BaseChromiumInstrumentationTestRunner;

import org.chromium.base.test.BaseTestResult;

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

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

@@ -22,6 +21,7 @@ import org.chromium.chrome.browser.vr_shell.VrClassesWrapper;

import org.chromium.chrome.browser.vr_shell.VrDaydreamApi;

import org.chromium.chrome.test.util.ChromeDisableIf;

import org.chromium.chrome.test.util.ChromeRestriction;

+import org.chromium.content.browser.test.ContentInstrumentationTestRunner;

import org.chromium.policy.test.annotations.Policies;

import org.chromium.ui.base.DeviceFormFactor;

@@ -36,8 +36,7 @@ import java.util.concurrent.FutureTask;

* An Instrumentation test runner that optionally spawns a test HTTP server.

* The server's root directory is the device's external storage directory.

-public class ChromeInstrumentationTestRunner extends BaseChromiumInstrumentationTestRunner {

+public class ChromeInstrumentationTestRunner extends ContentInstrumentationTestRunner {

private static final String TAG = "ChromeInstrumentationTestRunner";

@Override