Issue 6202. Remove support for 'Dynamic'. Add Clean Up to rename to 'dynamic'.

compiler/java/com/google/dart/compiler/resolver/ResolutionContext.java

 // Copyright (c) 2012, 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.
 
 package com.google.dart.compiler.resolver;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.dart.compiler.DartCompilationError;
 import com.google.dart.compiler.DartCompilerContext;
 import com.google.dart.compiler.ErrorCode;
 import com.google.dart.compiler.ErrorSeverity;
@@ skipping 195 matching lines @@
     }
     return element;
   }
 
   Type resolveType(DartNode diagnosticNode, DartNode identifier, List<DartTypeNode> typeArguments,
                    boolean isStatic, boolean isFactory, boolean isAnnotation, ErrorCode errorCode,
                    ErrorCode wrongNumberErrorCode) {
     // Built-in identifier can not be used as a type annotation.
     if (identifier instanceof DartIdentifier) {
       String name = ((DartIdentifier) identifier).getName();
-      if (DartParser.PSEUDO_KEYWORDS_SET.contains(name) && !DartParser.DYNAMIC_KEYWORD.equals(name)
-          && !DartParser.DYNAMIC_KEYWORD_DEPRECATED.equals(name)) {
+      if (DartParser.PSEUDO_KEYWORDS_SET.contains(name) && !"dynamic".equals(name)) {
         onError(identifier, ResolverErrorCode.BUILT_IN_IDENTIFIER_AS_TYPE, name);
         return Types.newDynamicType();
       }
     }
     // OK, valid name for type.
     Element element = resolveName(identifier);
     ElementKind elementKind = ElementKind.of(element);
     switch (elementKind) {
       case TYPE_VARIABLE: {
         TypeVariableElement typeVariableElement = (TypeVariableElement) element;
@@ skipping 23 matching lines @@
         } else {
           duplicateErrorCode = ResolverErrorCode.DUPLICATE_IMPORTED_NAME;
         }
         onError(identifier, duplicateErrorCode, element.getName(), locations.size(), locations);
         return typeProvider.getDynamicType();
       }
       case NONE:
         if (Elements.isIdentifierName(identifier, "void")) {
           return typeProvider.getVoidType();
         }
-        if (Elements.isIdentifierName(identifier, DartParser.DYNAMIC_KEYWORD)) {
-          return typeProvider.getDynamicType();
-        }
-        if (Elements.isIdentifierName(identifier, DartParser.DYNAMIC_KEYWORD_DEPRECATED)) {
+        if (Elements.isIdentifierName(identifier, "dynamic")) {
           return typeProvider.getDynamicType();
         }
         onError(identifier, errorCode, identifier);
         return typeProvider.getDynamicType();
       default:
         if (!(identifier instanceof DartSyntheticErrorIdentifier)) {
           if (errorCode.getSubSystem().equals(SubSystem.RESOLVER)) {
             onError(identifier, ResolverErrorCode.NOT_A_TYPE, identifier, elementKind);
           } else {
             onError(identifier, TypeErrorCode.NOT_A_TYPE, identifier, elementKind);
@@ skipping 123 matching lines @@
       String name = node.getName();
       return scope.findElement(scope.getLibrary(), name);
     }
 
     @Override
     public Element visitSyntheticErrorIdentifier(DartSyntheticErrorIdentifier node) {
       return Elements.dynamicElement();
     }
   }
 }