Improvements to causal async stack traces

runtime/observatory/tests/service/causal_async_star_stack_contents_test.dart

Index: runtime/observatory/tests/service/causal_async_star_stack_contents_test.dart
diff --git a/runtime/observatory/tests/service/causal_async_star_stack_contents_test.dart b/runtime/observatory/tests/service/causal_async_star_stack_contents_test.dart
index d50f69d251f6aa2cce34375bdb26bc7415595a68..0a32ace82d8745eae1f0e10f43f0bf1062e212e8 100644
--- a/runtime/observatory/tests/service/causal_async_star_stack_contents_test.dart
+++ b/runtime/observatory/tests/service/causal_async_star_stack_contents_test.dart
@@ -41,9 +41,9 @@ var tests = [
     // No causal frames because we are in a completely synchronous stack.
     expect(stack['asyncCausalFrames'], isNotNull);
     var asyncStack = stack['asyncCausalFrames'];
-    expect(asyncStack[0].toString(), contains('helper_async_body'));
+    expect(asyncStack[0].toString(), contains('helper'));
     expect(asyncStack[1].kind, equals(M.FrameKind.asyncSuspensionMarker));
-    expect(asyncStack[2].toString(), contains('helper'));
+    expect(asyncStack[2].toString(), contains('testMain'));
   },
   resumeIsolate,
   hasStoppedAtBreakpoint,
@@ -54,13 +54,11 @@ var tests = [
     // Has causal frames (we are inside an async function)
     expect(stack['asyncCausalFrames'], isNotNull);
     var asyncStack = stack['asyncCausalFrames'];
-    expect(asyncStack[0].toString(), contains('foobar_async_gen_body'));
+    expect(asyncStack[0].toString(), contains('foobar'));
     expect(asyncStack[1].kind, equals(M.FrameKind.asyncSuspensionMarker));
-    expect(asyncStack[2].toString(), contains('foobar'));
-    expect(asyncStack[3].toString(), contains('helper_async_body'));
-    expect(asyncStack[4].kind, equals(M.FrameKind.asyncSuspensionMarker));
-    expect(asyncStack[5].toString(), contains('helper'));
-    expect(asyncStack[6].toString(), contains('testMain'));
+    expect(asyncStack[2].toString(), contains('helper'));
+    expect(asyncStack[3].kind, equals(M.FrameKind.asyncSuspensionMarker));
+    expect(asyncStack[4].toString(), contains('testMain'));
   },
 
   resumeIsolate,
@@ -72,13 +70,11 @@ var tests = [
     // Has causal frames (we are inside a function called by an async function)
     expect(stack['asyncCausalFrames'], isNotNull);
     var asyncStack = stack['asyncCausalFrames'];
-    expect(asyncStack[0].toString(), contains('foobar_async_gen_body'));
+    expect(asyncStack[0].toString(), contains('foobar'));
     expect(asyncStack[1].kind, equals(M.FrameKind.asyncSuspensionMarker));
-    expect(asyncStack[2].toString(), contains('foobar'));
-    expect(asyncStack[3].toString(), contains('helper_async_body'));
-    expect(asyncStack[4].kind, equals(M.FrameKind.asyncSuspensionMarker));
-    expect(asyncStack[5].toString(), contains('helper'));
-    expect(asyncStack[6].toString(), contains('testMain'));
+    expect(asyncStack[2].toString(), contains('helper'));
+    expect(asyncStack[3].kind, equals(M.FrameKind.asyncSuspensionMarker));
+    expect(asyncStack[4].toString(), contains('testMain'));
   },
 ];