Revert "Refactor and clean up the status file parsing code."

tools/testing/dart/summary_report.dart

Index: tools/testing/dart/summary_report.dart
diff --git a/tools/testing/dart/summary_report.dart b/tools/testing/dart/summary_report.dart
index 0667c73773e15b8fe2fba8ffe95d815c6d4ffac5..e62f7726634aaf17a2b3cc822c777649cac2b701 100644
--- a/tools/testing/dart/summary_report.dart
+++ b/tools/testing/dart/summary_report.dart
@@ -4,7 +4,7 @@
 
 library summary_report;
 
-import "expectation.dart";
+import "status_file_parser.dart";
 import "test_runner.dart";
 
 final summaryReport = new SummaryReport();
@@ -34,15 +34,16 @@ class SummaryReport {
     var expectations = testCase.expectedOutcomes;
 
     bool containsFail = expectations
-        .any((expectation) => expectation.canBeOutcomeOf(Expectation.fail));
-    bool containsPass = expectations.contains(Expectation.pass);
+        .any((expectation) => expectation.canBeOutcomeOf(Expectation.FAIL));
+    bool containsPass = expectations.contains(Expectation.PASS);
     bool containsSkip = expectations
-        .any((expectation) => expectation.canBeOutcomeOf(Expectation.skip));
-    bool containsSkipByDesign = expectations.contains(Expectation.skipByDesign);
-    bool containsCrash = expectations.contains(Expectation.crash);
-    bool containsOK = expectations.contains(Expectation.ok);
-    bool containsSlow = expectations.contains(Expectation.slow);
-    bool containsTimeout = expectations.contains(Expectation.timeout);
+        .any((expectation) => expectation.canBeOutcomeOf(Expectation.SKIP));
+    bool containsSkipByDesign =
+        expectations.contains(Expectation.SKIP_BY_DESIGN);
+    bool containsCrash = expectations.contains(Expectation.CRASH);
+    bool containsOK = expectations.contains(Expectation.OK);
+    bool containsSlow = expectations.contains(Expectation.SLOW);
+    bool containsTimeout = expectations.contains(Expectation.TIMEOUT);
 
     ++_total;
     if (containsSkip) {