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

tools/testing/dart/summary_report.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library summary_report;
 
-import "expectation.dart";
+import "status_file_parser.dart";
 import "test_runner.dart";
 
 final summaryReport = new SummaryReport();
 
 class SummaryReport {
   int _total = 0;
   int _skipped = 0;
   int _skippedByDesign = 0;
   int _noCrash = 0;
   int _flakyCrash = 0;
   int _pass = 0;
   int _failOk = 0;
   int _fail = 0;
   int _crash = 0;
   int _timeout = 0;
   int _compileErrorSkip = 0;
 
   int get total => _total;
 
   int get skippedOther => _skipped - _skippedByDesign;
 
   int get bogus => _nonStandardTestCases.length;
 
   final List<TestCase> _nonStandardTestCases = <TestCase>[];
 
   void add(TestCase testCase) {
     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) {
       ++_skipped;
     } else if (containsSkipByDesign) {
       ++_skipped;
       ++_skippedByDesign;
     } else {
       // We don't do if-else below because the buckets should be exclusive.
       // We keep a count around to guarantee that
@@ skipping 68 matching lines @@
  * $_timeout tests are allowed to timeout
  * $_compileErrorSkip tests are skipped on browsers due to compile-time error
  * $bogus could not be categorized or are in multiple categories
 """;
 
   void printReport() {
     if (_total == 0) return;
     print(report);
   }
 }