Simplify CommandLine parameterizing J3 Instrumentation Tests

chrome/test/android/javatests/src/org/chromium/chrome/test/MultiActivityTestBase.java

Index: chrome/test/android/javatests/src/org/chromium/chrome/test/MultiActivityTestBase.java
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/MultiActivityTestBase.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/MultiActivityTestBase.java
index 0b22331a4f7e48b7411897558392492690d522ef..f2a2e966edd5eee47c5f6b9340df662e2d44ee5c 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/MultiActivityTestBase.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/MultiActivityTestBase.java
@@ -8,32 +8,18 @@ import android.content.Context;
 import android.test.InstrumentationTestCase;
 
 import org.chromium.base.test.util.CommandLineFlags;
-import org.chromium.base.test.util.parameter.BaseParameter;
-import org.chromium.base.test.util.parameter.Parameter;
-import org.chromium.base.test.util.parameter.Parameterizable;
-import org.chromium.base.test.util.parameter.parameters.MethodParameter;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.test.util.browser.tabmodel.document.MockStorageDelegate;
-import org.chromium.chrome.test.util.parameters.AddFakeAccountToAppParameter;
-import org.chromium.chrome.test.util.parameters.AddFakeAccountToOsParameter;
-import org.chromium.chrome.test.util.parameters.AddGoogleAccountToOsParameter;
-
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * Base for testing and interacting with multiple Activities (e.g. Document or Webapp Activities).
  */
 @CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
 public abstract class MultiActivityTestBase extends InstrumentationTestCase
-        implements Parameterizable, MultiActivityTestCommon.MultiActivityTestCommonCallback {
+        implements MultiActivityTestCommon.MultiActivityTestCommonCallback {
     private final MultiActivityTestCommon mTestCommon;
 
-    private Parameter.Reader mParameterReader;
-
-    private Map<String, BaseParameter> mAvailableParameters;
-
     public MultiActivityTestBase() {
         mTestCommon = new MultiActivityTestCommon(this);
     }
@@ -73,66 +59,4 @@ public abstract class MultiActivityTestBase extends InstrumentationTestCase
             boolean waitLongerForLoad) {
         mTestCommon.waitForFullLoad(activity, expectedTitle, waitLongerForLoad);
     }
-
-    /**
-     * Creates the {@link Map} of available parameters for the test to use.
-     *
-     * @return a {@link Map} of {@link BaseParameter} objects.
-     */
-    protected Map<String, BaseParameter> createAvailableParameters() {
-        Map<String, BaseParameter> availableParameters = new HashMap<>();
-        availableParameters
-                .put(MethodParameter.PARAMETER_TAG, new MethodParameter(getParameterReader()));
-        availableParameters.put(AddFakeAccountToAppParameter.PARAMETER_TAG,
-                new AddFakeAccountToAppParameter(getParameterReader(), getInstrumentation()));
-        availableParameters.put(AddFakeAccountToOsParameter.PARAMETER_TAG,
-                new AddFakeAccountToOsParameter(getParameterReader(), getInstrumentation()));
-        availableParameters.put(AddGoogleAccountToOsParameter.PARAMETER_TAG,
-                new AddGoogleAccountToOsParameter(getParameterReader(), getInstrumentation()));
-        return availableParameters;
-    }
-
-    /**
-     * Gets the {@link Map} of available parameters that inherited classes can use.
-     *
-     * @return a {@link Map} of {@link BaseParameter} objects to set as the available parameters.
-     */
-    @Override
-    public Map<String, BaseParameter> getAvailableParameters() {
-        return mAvailableParameters;
-    }
-
-    /**
-     * Gets a specific parameter from the current test.
-     *
-     * @param parameterTag a string with the name of the {@link BaseParameter} we want.
-     * @return a parameter that extends {@link BaseParameter} that has the matching parameterTag.
-     */
-    @Override
-    @SuppressWarnings("unchecked")
-    public <T extends BaseParameter> T getAvailableParameter(String parameterTag) {
-        return (T) mAvailableParameters.get(parameterTag);
-    }
-
-    /**
-     * Setter method for {@link Parameter.Reader}.
-     *
-     * @param parameterReader the {@link Parameter.Reader} to set.
-     */
-    @Override
-    public void setParameterReader(Parameter.Reader parameterReader) {
-        mParameterReader = parameterReader;
-        mAvailableParameters = createAvailableParameters();
-    }
-
-    /**
-     * Getter method for {@link Parameter.Reader} object to be used by test cases reading the
-     * parameter.
-     *
-     * @return the {@link Parameter.Reader} for the current {@link
-     * org.chromium.base.test.util.parameter.ParameterizedTest} being run.
-     */
-    protected Parameter.Reader getParameterReader() {
-        return mParameterReader;
-    }
 }