Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1643)

Unified Diff: base/test/android/javatests/src/org/chromium/base/test/BaseJUnit4ClassRunner.java

Issue 2818643002: Support ChildProcessAllocatorSettings in JUnit4 tests (Closed)
Patch Set: rebase 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 | « no previous file | chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/test/android/javatests/src/org/chromium/base/test/BaseJUnit4ClassRunner.java
diff --git a/base/test/android/javatests/src/org/chromium/base/test/BaseJUnit4ClassRunner.java b/base/test/android/javatests/src/org/chromium/base/test/BaseJUnit4ClassRunner.java
index 922536b89b881a08d6603ddf38ac4b47fb3c4b0d..57bed8fa558757677c595eb2a62585a78828f6ec 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/BaseJUnit4ClassRunner.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/BaseJUnit4ClassRunner.java
@@ -84,7 +84,7 @@ public class BaseJUnit4ClassRunner extends AndroidJUnit4ClassRunner {
new AndroidRunnerParams(InstrumentationRegistry.getInstrumentation(),
InstrumentationRegistry.getArguments(), false, 0L, false));
mSkipChecks = mergeList(checks, defaultSkipChecks());
- mPreTestHooks = defaultPreTestHooks();
+ mPreTestHooks = mergeList(hooks, defaultPreTestHooks());
}
/**
« no previous file with comments | « no previous file | chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698