Update instrumentation tests to use PreTestHooks for policies

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..657e46562118d5166c3f88ed3aabf7235a9c668c 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
@@ -19,7 +19,9 @@
 import org.chromium.base.Log;
 import org.chromium.base.SysUtils;
 import org.chromium.base.multidex.ChromiumMultiDex;
+import org.chromium.base.test.BaseTestResult.PreTestHook;
 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 +47,7 @@ protected AndroidTestRunner getAndroidTestRunner() {
             @Override
             protected TestResult createTestResult() {
                 BaseTestResult r = new BaseTestResult(BaseInstrumentationTestRunner.this);
-                addSkipChecks(r);
+                addTestHooks(r);
                 return r;
             }
         };
@@ -54,17 +56,22 @@ protected TestResult createTestResult() {
     }
 
     /**
-     * Adds the desired SkipChecks to result. Subclasses can add additional SkipChecks.
+     * Adds the desired hooks to result. Subclasses can add additional ones.

[aberent, 2015/10/07 11:13:02]

Are SkipChecks really hooks? While combining the two is probably sensible from a
practical point of view, maybe the comment could be made more explicit.

[dgn, 2015/10/07 14:36:57]

They are hooks in the general sense, just not pretest ones. I added more to the
description.

+     * @see SkipCheck
+     * @see PreTestHook
      */
-    protected void addSkipChecks(BaseTestResult result) {
+    protected void addTestHooks(BaseTestResult result) {
         result.addSkipCheck(new MinAndroidSdkLevelSkipCheck());
         result.addSkipCheck(new RestrictionSkipCheck());
+
+        result.addPreTestHook(CommandLineFlags.getRegistrationHook());
     }
 
     /**
      * 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 {