Add pre instrumentation test hooks

base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java

Index: base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java
diff --git a/base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java b/base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java
index 0eab2314b40b7abec9e44e6ef52c18e60e952365..24126abacbfc97a0a9b7a36cb26544f1b861c64d 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java
@@ -20,6 +20,7 @@
 import org.chromium.base.SysUtils;
 import org.chromium.base.multidex.ChromiumMultiDex;
 import org.chromium.base.test.BaseTestResult.SkipCheck;
+import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.MinAndroidSdkLevel;
 import org.chromium.base.test.util.Restriction;
 import org.chromium.test.reporter.TestStatusListener;
@@ -45,7 +46,7 @@ protected AndroidTestRunner getAndroidTestRunner() {
             @Override
             protected TestResult createTestResult() {
                 BaseTestResult r = new BaseTestResult(BaseInstrumentationTestRunner.this);
-                addSkipChecks(r);
+                addTestHooks(r);
                 return r;
             }
         };
@@ -54,17 +55,24 @@ protected TestResult createTestResult() {
     }
 
     /**
-     * Adds the desired SkipChecks to result. Subclasses can add additional SkipChecks.
+     * Override this method to register hooks and checks to be run for each test. Make sure to call
+     * the base implementation if you do so.
+     *
+     * @see BaseTestResult#addSkipCheck(BaseTestResult.SkipCheck)
+     * @see BaseTestResult#addPreTestHook(BaseTestResult.PreTestHook)
      */
-    protected void addSkipChecks(BaseTestResult result) {
+    protected void addTestHooks(BaseTestResult result) {
         result.addSkipCheck(new MinAndroidSdkLevelSkipCheck());
         result.addSkipCheck(new RestrictionSkipCheck());
+
+        result.addPreTestHook(CommandLineFlags.getRegistrationHook());

[Yaron, 2015/10/13 21:42:41]

This seems a little weird to me - the base test fixture reaching into
CommandLineFlags. That said, it doesn't seem any worse than TestResult having
the dependency and is better in that it's more general

[dgn, 2015/10/14 08:29:52]

Since we have TestRunners for the different layers (Base, Chrome, WebView soon),
I considered that the test runner for a given layer registers stuff that makes
sense for that layer.

I could have experimented with modifying the test cases instead, I don't know if
#setUp() reliably happens early enough... The fact that we can override it very
easily in any single test doesn't feel that nice too. I think test cases by
themselves should be as small as possible.

     }
 
     /**
      * Checks if any restrictions exist and skip the test if it meets those restrictions.
      */
     public class RestrictionSkipCheck implements SkipCheck {
+        @Override
         public boolean shouldSkip(TestCase testCase) {
             Method method;
             try {