| Index: pkg/analyzer/lib/src/dart/resolver/inheritance_manager.dart
 | 
| diff --git a/pkg/analyzer/lib/src/dart/resolver/inheritance_manager.dart b/pkg/analyzer/lib/src/dart/resolver/inheritance_manager.dart
 | 
| index f00cc35d30853799ae39d96a964acf3741392b91..69d3948ded0b4ec95e4711eca38ec0a01b067572 100644
 | 
| --- a/pkg/analyzer/lib/src/dart/resolver/inheritance_manager.dart
 | 
| +++ b/pkg/analyzer/lib/src/dart/resolver/inheritance_manager.dart
 | 
| @@ -5,7 +5,6 @@
 | 
|  import 'dart:collection';
 | 
|  
 | 
|  import 'package:analyzer/dart/ast/ast.dart';
 | 
| -import 'package:analyzer/dart/ast/standard_ast_factory.dart';
 | 
|  import 'package:analyzer/dart/ast/token.dart';
 | 
|  import 'package:analyzer/dart/element/element.dart';
 | 
|  import 'package:analyzer/dart/element/type.dart';
 | 
| @@ -963,8 +962,8 @@ class InheritanceManager {
 | 
|        int numOfPositionalParameters,
 | 
|        List<String> namedParameters) {
 | 
|      DynamicTypeImpl dynamicType = DynamicTypeImpl.instance;
 | 
| -    SimpleIdentifier nameIdentifier = astFactory
 | 
| -        .simpleIdentifier(new StringToken(TokenType.IDENTIFIER, name, 0));
 | 
| +    SimpleIdentifier nameIdentifier =
 | 
| +        new SimpleIdentifier(new StringToken(TokenType.IDENTIFIER, name, 0));
 | 
|      ExecutableElementImpl executable;
 | 
|      ExecutableElement elementToMerge = elementArrayToMerge[0];
 | 
|      if (elementToMerge is MethodElement) {
 | 
| 
 |