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

runtime/observatory/tests/service/async_single_step_out_test.dart

Index: runtime/observatory/tests/service/async_single_step_out_test.dart
diff --git a/runtime/observatory/tests/service/async_single_step_out_test.dart b/runtime/observatory/tests/service/async_single_step_out_test.dart
index 4262f6c213d2e9faec01f8c6495f800366acb8f7..f66360f1507e727c90e76cf575a2fd063026eccd 100644
--- a/runtime/observatory/tests/service/async_single_step_out_test.dart
+++ b/runtime/observatory/tests/service/async_single_step_out_test.dart
@@ -4,11 +4,18 @@
 // 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 = 20;
+const LINE_B = 21;
+const LINE_C = 26;
+const LINE_D = 27;
+const LINE_E = 28;
+
 helper() async {
   print('helper'); // LINE_A.
   return null; // LINE_B.
@@ -21,23 +28,21 @@ testMain() async {
   print('z'); // LINE_E.
 }
 
-final ScriptLineParser lineParser = new ScriptLineParser(Platform.script);
-
 var tests = [
   hasStoppedAtBreakpoint,
-  stoppedAtLine(lineParser.lineFor('LINE_C')),
+  stoppedAtLine(LINE_C),
   stepOver, // print.
   hasStoppedAtBreakpoint,
-  stoppedAtLine(lineParser.lineFor('LINE_D')),
+  stoppedAtLine(LINE_D),
   stepInto,
   hasStoppedAtBreakpoint,
-  stoppedAtLine(lineParser.lineFor('LINE_A')),
+  stoppedAtLine(LINE_A),
   stepOver, // print.
   hasStoppedAtBreakpoint,
-  stoppedAtLine(lineParser.lineFor('LINE_B')), // return null.
+  stoppedAtLine(LINE_B), // return null.
   stepInto, // exit helper via a single step.
   hasStoppedAtBreakpoint,
-  stoppedAtLine(lineParser.lineFor('LINE_E')), // arrive after the await.
+  stoppedAtLine(LINE_E), // arrive after the await.
   resumeIsolate
 ];