Issue 5116. Support both 'dynamic' and 'Dynamic'

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

Index: compiler/java/com/google/dart/compiler/resolver/ResolutionContext.java
diff --git a/compiler/java/com/google/dart/compiler/resolver/ResolutionContext.java b/compiler/java/com/google/dart/compiler/resolver/ResolutionContext.java
index da00fd787ab8f565950ba8aa61e2d69cb1989742..fb7b6a3b759481b0b17da361ace798c9e0df0fd1 100644
--- a/compiler/java/com/google/dart/compiler/resolver/ResolutionContext.java
+++ b/compiler/java/com/google/dart/compiler/resolver/ResolutionContext.java
@@ -213,7 +213,8 @@ public class ResolutionContext implements ResolutionErrorListener {
     // 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) && !"Dynamic".equals(name)) {
+      if (DartParser.PSEUDO_KEYWORDS_SET.contains(name) && !DartParser.DYNAMIC_KEYWORD.equals(name)
+          && !DartParser.DYNAMIC_KEYWORD_DEPRECATED.equals(name)) {
         onError(identifier, ResolverErrorCode.BUILT_IN_IDENTIFIER_AS_TYPE, name);
         return Types.newDynamicType();
       }
@@ -270,7 +271,10 @@ public class ResolutionContext implements ResolutionErrorListener {
         if (Elements.isIdentifierName(identifier, "void")) {
           return typeProvider.getVoidType();
         }
-        if (Elements.isIdentifierName(identifier, "Dynamic")) {
+        if (Elements.isIdentifierName(identifier, DartParser.DYNAMIC_KEYWORD)) {
+          return typeProvider.getDynamicType();
+        }
+        if (Elements.isIdentifierName(identifier, DartParser.DYNAMIC_KEYWORD_DEPRECATED)) {
           return typeProvider.getDynamicType();
         }
         onError(identifier, errorCode, identifier);