Index: chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeJUnit4ClassRunner.java |
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeJUnit4ClassRunner.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeJUnit4ClassRunner.java |
index e063ca25abc5925b4890e16e31ec0abf48211dd5..94e6f2119d77a08ad10792f4e1078767ea26998c 100644 |
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeJUnit4ClassRunner.java |
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeJUnit4ClassRunner.java |
@@ -8,12 +8,15 @@ import android.support.test.InstrumentationRegistry; |
import org.junit.runners.model.InitializationError; |
+import org.chromium.base.CollectionUtil; |
import org.chromium.base.test.BaseJUnit4ClassRunner; |
+import org.chromium.base.test.BaseTestResult.PreTestHook; |
+import org.chromium.base.test.util.CommandLineFlags; |
import org.chromium.base.test.util.SkipCheck; |
import org.chromium.chrome.test.ChromeInstrumentationTestRunner.ChromeDisableIfSkipCheck; |
import org.chromium.chrome.test.ChromeInstrumentationTestRunner.ChromeRestrictionSkipCheck; |
+import org.chromium.content.browser.test.ChildProcessAllocatorSettingsHook; |
-import java.util.Arrays; |
import java.util.List; |
/** |
@@ -26,12 +29,18 @@ public class ChromeJUnit4ClassRunner extends BaseJUnit4ClassRunner { |
* @throws InitializationError if the test class malformed |
*/ |
public ChromeJUnit4ClassRunner(final Class<?> klass) throws InitializationError { |
- super(klass, defaultSkipChecks(), null); |
+ super(klass, defaultSkipChecks(), defaultPreTestHooks()); |
} |
private static List<SkipCheck> defaultSkipChecks() { |
- return Arrays.asList(new SkipCheck[] { |
+ return CollectionUtil.newArrayList( |
new ChromeRestrictionSkipCheck(InstrumentationRegistry.getTargetContext()), |
- new ChromeDisableIfSkipCheck(InstrumentationRegistry.getTargetContext())}); |
+ new ChromeDisableIfSkipCheck(InstrumentationRegistry.getTargetContext())); |
} |
+ |
+ private static List<PreTestHook> defaultPreTestHooks() { |
+ return CollectionUtil.newArrayList(CommandLineFlags.getRegistrationHook(), |
+ new ChildProcessAllocatorSettingsHook()); |
+ } |
+ |
} |