Revert "Re-apply status file parser changes from 0b7728da1bef08c1c1e092005d9fd8c8bff5fa6c."

tools/testing/dart/test_progress.dart

Index: tools/testing/dart/test_progress.dart
diff --git a/tools/testing/dart/test_progress.dart b/tools/testing/dart/test_progress.dart
index b266e243f503188c40699468979679bc3302d49f..8ee07a876b2586e427063919a1b1ae6be93903c1 100644
--- a/tools/testing/dart/test_progress.dart
+++ b/tools/testing/dart/test_progress.dart
@@ -7,8 +7,8 @@ library test_progress;
 import "dart:convert" show JSON;
 import "dart:io";
 
-import "expectation.dart";
 import "path.dart";
+import "status_file_parser.dart";
 import "summary_report.dart";
 import "test_runner.dart";
 import "test_suite.dart";
@@ -67,7 +67,7 @@ class IgnoredTestMonitor extends EventListener {
   int countIgnored = 0;
 
   void done(TestCase test) {
-    if (test.lastCommandOutput.result(test) == Expectation.ignore) {
+    if (test.lastCommandOutput.result(test) == Expectation.IGNORE) {
       countIgnored++;
       if (countIgnored > maxIgnored) {
         print("/nMore than $maxIgnored tests were ignored due to flakes in");
@@ -88,7 +88,7 @@ class IgnoredTestMonitor extends EventListener {
 
 class FlakyLogWriter extends EventListener {
   void done(TestCase test) {
-    if (test.isFlaky && test.result != Expectation.pass) {
+    if (test.isFlaky && test.result != Expectation.PASS) {
       var buf = new StringBuffer();
       for (var l in _buildFailureOutput(test)) {
         buf.write("$l\n");
@@ -207,7 +207,7 @@ class UnexpectedCrashLogger extends EventListener {
 
   void done(TestCase test) {
     if (test.unexpectedOutput &&
-        test.result == Expectation.crash &&
+        test.result == Expectation.CRASH &&
         test.lastCommandExecuted is ProcessCommand) {
       final pid = "${test.lastCommandOutput.pid}";
       final lastCommand = test.lastCommandExecuted as ProcessCommand;