Simplify CommandLine parameterizing J3 Instrumentation Tests

android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
index 92ade8578f51aad1e9f9b79497aec56f1f3602bc..f67a27263ea1230c3ae0952687fae0ef1db43199 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
@@ -27,11 +27,9 @@ import org.chromium.android_webview.test.util.JSUtils;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.BaseActivityInstrumentationTestCase;
 import org.chromium.base.test.util.CallbackHelper;
-import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.InMemorySharedPreferences;
 import org.chromium.base.test.util.MinAndroidSdkLevel;
-import org.chromium.base.test.util.parameter.Parameter;
-import org.chromium.base.test.util.parameter.ParameterizedTest;
+import org.chromium.base.test.util.parameter.CommandLineParameter;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPageFinishedHelper;
@@ -56,23 +54,11 @@ import java.util.regex.Pattern;
  * If a test doesn't yet work with sandboxed renderer, an entire class, or an individual test
  * method can be marked for single-process testing only by adding the following annotation:
  *
- * @ParameterizedTest.Set
+ * @SkipCommandLineParameterization
  */
 @MinAndroidSdkLevel(Build.VERSION_CODES.KITKAT)
-@ParameterizedTest.Set(tests = {
-            @ParameterizedTest(parameters = {
-                        @Parameter(
-                                tag = CommandLineFlags.Parameter.PARAMETER_TAG)}),
-            @ParameterizedTest(parameters = {
-                        @Parameter(
-                                tag = CommandLineFlags.Parameter.PARAMETER_TAG,
-                                arguments = {
-                                    @Parameter.Argument(
-                                        name = CommandLineFlags.Parameter.ADD_ARG,
-                                        stringArray = {AwSwitches.WEBVIEW_SANDBOXED_RENDERER})
-            })})})
-public class AwTestBase
-        extends BaseActivityInstrumentationTestCase<AwTestRunnerActivity> {
+@CommandLineParameter({"", AwSwitches.WEBVIEW_SANDBOXED_RENDERER})
+public class AwTestBase extends BaseActivityInstrumentationTestCase<AwTestRunnerActivity> {
     public static final long WAIT_TIMEOUT_MS = scaleTimeout(15000);
     public static final int CHECK_INTERVAL = 100;
     private static final String TAG = "AwTestBase";