Revert "Add support for the new function-type syntax."

pkg/compiler/lib/src/tree/unparser.dart

Index: pkg/compiler/lib/src/tree/unparser.dart
diff --git a/pkg/compiler/lib/src/tree/unparser.dart b/pkg/compiler/lib/src/tree/unparser.dart
index 0413e23263c73f5fc5e6c4d2e20a8b19479f7091..1aa5eb70be30a4c9d324f5fd40b1e1d30776c7a5 100644
--- a/pkg/compiler/lib/src/tree/unparser.dart
+++ b/pkg/compiler/lib/src/tree/unparser.dart
@@ -548,18 +548,11 @@ class Unparser extends Indentation implements Visitor {
     visit(node.expression);
   }
 
-  visitNominalTypeAnnotation(NominalTypeAnnotation node) {
+  visitTypeAnnotation(TypeAnnotation node) {
     visit(node.typeName);
     visit(node.typeArguments);
   }
 
-  visitFunctionTypeAnnotation(FunctionTypeAnnotation node) {
-    visit(node.returnType);
-    write(' Function');
-    visit(node.typeParameters);
-    visit(node.formals);
-  }
-
   visitTypeVariable(TypeVariable node) {
     visit(node.name);
     if (node.bound != null) {
@@ -778,8 +771,8 @@ class Unparser extends Indentation implements Visitor {
       write(' ');
     }
     visit(node.name);
-    if (node.templateParameters != null) {
-      visit(node.templateParameters);
+    if (node.typeParameters != null) {
+      visit(node.typeParameters);
     }
     visit(node.formals);
     write(node.endToken.value);
@@ -911,8 +904,4 @@ class Unparser extends Indentation implements Visitor {
   visitStringNode(StringNode node) {
     throw 'internal error'; // Should not be called.
   }
-
-  visitTypeAnnotation(TypeAnnotation node) {
-    throw 'internal error'; // Should not be called.
-  }
 }