Add CommandLineArgumentParameter and use it for WebView tests

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

Index: base/test/android/javatests/src/org/chromium/base/test/BaseTestResult.java
diff --git a/base/test/android/javatests/src/org/chromium/base/test/BaseTestResult.java b/base/test/android/javatests/src/org/chromium/base/test/BaseTestResult.java
index 64ad9f24236b0e3ef733b8cd5c4ff7c10647f992..d482a9a20fca89e88b65e5d5c8d604aad712b741 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/BaseTestResult.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/BaseTestResult.java
@@ -18,6 +18,7 @@ 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.ParameterizedTest;
+import org.chromium.base.test.util.parameter.parameters.CommandLineArgumentParameter;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -156,6 +157,19 @@ public class BaseTestResult extends TestResult {
         List<ParameterError> failures = new ArrayList<>();
         Map<String, BaseParameter> availableParameters = testCase.getAvailableParameters();
 
+        // Remove all @ParameterizedTests that contain CommandLineArgumentParameter -- those
+        // are handled in test_runner.py as it is needed to re-launch the whole test activity
+        // to apply command-line args correctly. Note that this way we will also ignore any
+        // other parameters that may present in these @ParameterizedTests.
+        for (Iterator<ParameterizedTest> iter = parameterizedTests.iterator(); iter.hasNext();) {
+            ParameterizedTest paramTest = iter.next();
+            for (Parameter p: paramTest.parameters()) {
+                if (CommandLineArgumentParameter.PARAMETER_TAG.equals(p.tag())) {
+                    iter.remove();
+                }
+            }
+        }
+
         if (parameterizedTests.isEmpty()) {
             super.run(test);
         } else {