Revert "Revert "Revert "Refactor test option parsing code."""

tools/testing/dart/test_suite.dart

Index: tools/testing/dart/test_suite.dart
diff --git a/tools/testing/dart/test_suite.dart b/tools/testing/dart/test_suite.dart
index cf0af89723d035f20ea31a7eeaff8d78bbad2c2a..08362f36542656717f986f372c4cf43de31e5247 100644
--- a/tools/testing/dart/test_suite.dart
+++ b/tools/testing/dart/test_suite.dart
@@ -474,7 +474,7 @@ class CCTestSuite extends TestSuite {
 
     var args = TestUtils.standardOptions(configuration);
     var compilerConfiguration = new CompilerConfiguration(configuration);
-    if (compilerConfiguration.useDfe) {
+    if (compilerConfiguration.useDFE) {
       args.add('--use-dart-frontend');
       // '--dfe' has to be the first argument for run_vm_test to pick it up.
       args.insert(0, '--dfe=$buildDir/gen/kernel-service.dart.snapshot');
@@ -2028,6 +2028,9 @@ class TestUtils {
     if (compiler == "dart2js" && configuration["csp"]) {
       args.add("--csp");
     }
+    if (compiler == "dart2js" && configuration["cps_ir"]) {
+      args.add("--use-cps-ir");
+    }
     if (compiler == "dart2js" && configuration["fast_startup"]) {
       args.add("--fast-startup");
     }