Simplify annotations in runtime check tests.

pkg/front_end/testcases/runtime_checks/call_through_this.dart

Index: pkg/front_end/testcases/runtime_checks/call_through_this.dart
diff --git a/pkg/front_end/testcases/runtime_checks/call_through_this.dart b/pkg/front_end/testcases/runtime_checks/call_through_this.dart
index d4f71f0586c51c834c639e1b7b9a748eff547c1b..a53a5fc4ae34c353235e84dc4f669df533b235d1 100644
--- a/pkg/front_end/testcases/runtime_checks/call_through_this.dart
+++ b/pkg/front_end/testcases/runtime_checks/call_through_this.dart
@@ -8,17 +8,18 @@ library test;
 typedef F<T>(T x);
 
 class C<T> {
-  void f(T /*@checkFormal=semiSafe*/ x) {}
-  void g1(T /*@checkFormal=semiSafe*/ x) {
-    this.f(x);
+  void f(T /*@checkFormal=semiSafe*/ /*@checkInterface=semiTyped*/ x) {}
+  void g1(T /*@checkFormal=semiSafe*/ /*@checkInterface=semiTyped*/ x) {
+    this.f /*@callKind=this*/ (x);
   }
 
-  void g2(T /*@checkFormal=semiSafe*/ x) {
-    f(x);
+  void g2(T /*@checkFormal=semiSafe*/ /*@checkInterface=semiTyped*/ x) {
+    f /*@callKind=this*/ (x);
   }
 
-  void g3(C<T> /*@checkFormal=semiSafe*/ c, T /*@checkFormal=semiSafe*/ x) {
-    c.f /*@checkCall=interface(semiTyped:0)*/ (x);
+  void g3(C<T> /*@checkFormal=semiSafe*/ /*@checkInterface=semiTyped*/ c,
+      T /*@checkFormal=semiSafe*/ /*@checkInterface=semiTyped*/ x) {
+    c.f(x);
   }
 
   F<T> g4() => this.f;
@@ -32,7 +33,7 @@ class E extends C<num> {
 
 test() {
   var x = new D().g4() as F<Object>;
-  x /*@checkCall=interface(semiTyped:0)*/ ('hi');
+  x /*@callKind=closure*/ ('hi');
   new E().g1(1.5);
 }