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

pkg/compiler/lib/src/resolution/typedefs.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library dart2js.resolution.typedefs;
 
 import '../common.dart';
 import '../common/resolution.dart';
 import '../elements/resolution_types.dart';
 import '../elements/elements.dart'
     show FunctionSignature, TypedefElement, TypeVariableElement;
 import '../elements/modelx.dart' show ErroneousElementX, TypedefElementX;
 import '../tree/tree.dart';
 import '../util/util.dart' show Link;
 import 'class_hierarchy.dart' show TypeDefinitionVisitor;
 import 'registry.dart' show ResolutionRegistry;
 import 'scope.dart' show MethodScope, TypeDeclarationScope;
 import 'signatures.dart' show SignatureResolver;
 
 class TypedefResolverVisitor extends TypeDefinitionVisitor {
   TypedefElementX get element => enclosingElement;
 
   TypedefResolverVisitor(Resolution resolution, TypedefElement typedefElement,
       ResolutionRegistry registry)
       : super(resolution, typedefElement, registry);
 
   visitTypedef(Typedef node) {
     element.computeType(resolution);
     scope = new TypeDeclarationScope(scope, element);
-    resolveTypeVariableBounds(node.templateParameters);
+    resolveTypeVariableBounds(node.typeParameters);
 
     FunctionSignature signature = SignatureResolver.analyze(
         resolution,
         scope,
-        node.typeParameters,
+        null /* typeVariables */,
         node.formals,
         node.returnType,
         element,
         registry,
         defaultValuesError: MessageKind.TYPEDEF_FORMAL_WITH_DEFAULT);
     element.functionSignature = signature;
 
     scope = new MethodScope(scope, element);
     signature.forEachParameter(addToScope);
 
@@ skipping 90 matching lines @@
     if (seenTypeVariables.contains(typeVariableElement)) {
       // Avoid running in cycles on cyclic type variable bounds.
       // Cyclicity is reported elsewhere.
       return;
     }
     seenTypeVariables = seenTypeVariables.prepend(typeVariableElement);
     typeVariableElement.bound.accept(this, null);
     seenTypeVariables = seenTypeVariables.tail;
   }
 }