Revert "Address additional analysis issues in the observatory codebase."

runtime/observatory/tests/service/async_star_step_out_test.dart

Index: runtime/observatory/tests/service/async_star_step_out_test.dart
diff --git a/runtime/observatory/tests/service/async_star_step_out_test.dart b/runtime/observatory/tests/service/async_star_step_out_test.dart
index b6b8357a649b05f1abac545f9e41d4c1c51833ad..a59f955227721fe07c4827b3768c07fe137282f5 100644
--- a/runtime/observatory/tests/service/async_star_step_out_test.dart
+++ b/runtime/observatory/tests/service/async_star_step_out_test.dart
@@ -4,11 +4,22 @@
 // VMOptions=--error_on_bad_type --error_on_bad_override  --verbose_debug --async_debugger
 
 import 'dart:developer';
-import 'dart:io';
-
+import 'package:observatory/models.dart' as M;
+import 'package:observatory/service_io.dart';
+import 'package:unittest/unittest.dart';
 import 'service_test_common.dart';
 import 'test_helper.dart';
 
+const LINE_A = 24;
+const LINE_B = 25;
+const LINE_C = 29;
+const LINE_D = 32;
+const LINE_E = 39;
+const LINE_F = 40;
+const LINE_G = 41;
+const LINE_H = 30;
+const LINE_I = 34;
+
 foobar() async* {
   yield 1; // LINE_A.
   yield 2; // LINE_B.
@@ -16,7 +27,7 @@ foobar() async* {
 
 helper() async {
   print('helper'); // LINE_C.
-  await for (var i in foobar()) /* LINE_H */ {
+  await for (var i in foobar()) { // LINE_H.
     debugger();
     print('loop'); // LINE_D.
   }
@@ -30,51 +41,49 @@ testMain() {
   print('z'); // LINE_G.
 }
 
-final ScriptLineParser lineParser = new ScriptLineParser(Platform.script);
-
 var tests = [
   hasStoppedAtBreakpoint,
-  stoppedAtLine(lineParser.lineFor('LINE_E')),
+  stoppedAtLine(LINE_E),
   stepOver, // print.
   hasStoppedAtBreakpoint,
-  stoppedAtLine(lineParser.lineFor('LINE_F')),
+  stoppedAtLine(LINE_F),
   stepInto,
   hasStoppedAtBreakpoint,
-  stoppedAtLine(lineParser.lineFor('LINE_C')),
+  stoppedAtLine(LINE_C),
   stepOver, // print.
   hasStoppedAtBreakpoint,
   stepInto,
   hasStoppedAtBreakpoint,
-  stoppedAtLine(lineParser.lineFor('LINE_A')),
+  stoppedAtLine(LINE_A),
   stepOut, // step out of generator.
   hasStoppedAtBreakpoint,
-  stoppedAtLine(lineParser.lineFor('LINE_H')), // await for.
+  stoppedAtLine(LINE_H), // await for.
   stepInto,
   hasStoppedAtBreakpoint, // debugger().
   stepInto,
   hasStoppedAtBreakpoint,
-  stoppedAtLine(lineParser.lineFor('LINE_D')), // print.
+  stoppedAtLine(LINE_D), // print.
   stepInto,
   hasStoppedAtBreakpoint, // await for.
   stepInto,
   hasStoppedAtBreakpoint, // back in generator.
-  stoppedAtLine(lineParser.lineFor('LINE_B')),
+  stoppedAtLine(LINE_B),
   stepOut, // step out of generator.
   hasStoppedAtBreakpoint,
-  stoppedAtLine(lineParser.lineFor('LINE_H')), // await for.
+  stoppedAtLine(LINE_H), // await for.
   stepInto,
   hasStoppedAtBreakpoint, // debugger().
   stepInto,
   hasStoppedAtBreakpoint,
-  stoppedAtLine(lineParser.lineFor('LINE_D')), // print.
+  stoppedAtLine(LINE_D), // print.
   stepInto,
   hasStoppedAtBreakpoint,
-  stoppedAtLine(lineParser.lineFor('LINE_H')), // await for.
+  stoppedAtLine(LINE_H), // await for.
   stepInto,
   hasStoppedAtBreakpoint,
   stepOut, // step out of generator.
   hasStoppedAtBreakpoint,
-  stoppedAtLine(lineParser.lineFor('LINE_I')), // return null.
+  stoppedAtLine(LINE_I), // return null.
 ];
 
 main(args) =>