Separate BaseInstrumentationTestRunner from BaseChromiumITR

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

Index: base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java
diff --git a/base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java b/base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java
new file mode 100644
index 0000000000000000000000000000000000000000..d44c9ddce6dd080d252e30d85864d07db8985afa
--- /dev/null
+++ b/base/test/android/javatests/src/org/chromium/base/test/BaseChromiumInstrumentationTestRunner.java
@@ -0,0 +1,36 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package org.chromium.base.test;
+
+import android.os.Bundle;
+
+import org.chromium.base.multidex.ChromiumMultiDexInstaller;
+import org.chromium.base.test.util.CommandLineFlags;
+
+// TODO(jbudorick): Add support for on-device handling of timeouts.
+/**
+ * An Instrumentation test runner for applications that are based on
+ * {@code org.chromium.base.BaseChromiumApplication}
+ */
+public class BaseChromiumInstrumentationTestRunner extends BaseInstrumentationTestRunner {

[sgurun-gerrit only, 2016/05/27 22:01:24]

name not compatible with the class extending, ChromeInstrumentationTestRunner.
Rename to BaseChromeInstrumentationTestRunner

[jbudorick, 2016/05/27 22:06:34]

I disagree. ChromeITR is so named because it's in //chrome. BaseChromiumITR is
so named because it's specific to applications extending from
BaseChromiumApplication.

+    @Override
+    public void onCreate(Bundle arguments) {
+        ChromiumMultiDexInstaller.install(getTargetContext());
+        super.onCreate(arguments);
+    }
+
+    /**
+     * 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)
+     */
+    @Override
+    protected void addTestHooks(BaseTestResult result) {
+        super.addTestHooks(result);
+        result.addPreTestHook(CommandLineFlags.getRegistrationHook());
+    }
+}