Prefix resolution_types with Resolution.

tests/compiler/dart2js/mixin_typevariable_test.dart

Index: tests/compiler/dart2js/mixin_typevariable_test.dart
diff --git a/tests/compiler/dart2js/mixin_typevariable_test.dart b/tests/compiler/dart2js/mixin_typevariable_test.dart
index d2e30376cb60d3fa7dda5fe4b5021e1961f9470c..deb26abc83d8d1d6999d9a3b7c3fa21637d9cac0 100644
--- a/tests/compiler/dart2js/mixin_typevariable_test.dart
+++ b/tests/compiler/dart2js/mixin_typevariable_test.dart
@@ -50,7 +50,8 @@ void testMixinSupertypes() {
             Expect.equals(
                 element, element.typeVariables.first.element.enclosingElement);
           }
-          for (InterfaceType supertype in element.allSupertypesAndSelf.types) {
+          for (ResolutionInterfaceType supertype
+              in element.allSupertypesAndSelf.types) {
             if (!supertype.typeArguments.isEmpty) {
               Expect.listEquals(element.typeVariables, supertype.typeArguments,
                   "Type argument mismatch on supertype $supertype of $element.");
@@ -96,8 +97,8 @@ void testNonTrivialSubstitutions() {
       """,
               expectNoWarningsOrErrors: true)
           .then((env) {
-        DartType _dynamic = env['dynamic'];
-        DartType _ = env['_'];
+        ResolutionDartType _dynamic = env['dynamic'];
+        ResolutionDartType _ = env['_'];
 
         ClassElement Object = env.getElement('Object');
         ClassElement A = env.getElement('A');
@@ -117,13 +118,14 @@ void testNonTrivialSubstitutions() {
         ClassElement F1_A_B = F1.superclass;
 
         void testSupertypes(ClassElement element,
-            Map<ClassElement, List<DartType>> typeArguments) {
+            Map<ClassElement, List<ResolutionDartType>> typeArguments) {
           if (element != Object) {
             Expect.isTrue(element.typeVariables.length == 1);
             Expect.equals(
                 element, element.typeVariables.first.element.enclosingElement);
           }
-          for (InterfaceType supertype in element.allSupertypesAndSelf.types) {
+          for (ResolutionInterfaceType supertype
+              in element.allSupertypesAndSelf.types) {
             if (typeArguments.containsKey(supertype.element)) {
               Expect.listEquals(
                   typeArguments[supertype.element],
@@ -151,7 +153,7 @@ void testNonTrivialSubstitutions() {
           B: [_dynamic, _dynamic]
         });
 
-        DartType D1_T = D1.typeVariables.first;
+        ResolutionDartType D1_T = D1.typeVariables.first;
         testSupertypes(D1, {
           A: [D1_T],
           B: [
@@ -159,7 +161,7 @@ void testNonTrivialSubstitutions() {
             instantiate(A, [D1_T])
           ]
         });
-        DartType D1_superclass_T = D1.superclass.typeVariables.first;
+        ResolutionDartType D1_superclass_T = D1.superclass.typeVariables.first;
         testSupertypes(D1.superclass, {
           A: [D1_superclass_T],
           B: [
@@ -167,7 +169,7 @@ void testNonTrivialSubstitutions() {
             instantiate(A, [D1_superclass_T])
           ]
         });
-        DartType D2_T = D2.typeVariables.first;
+        ResolutionDartType D2_T = D2.typeVariables.first;
         testSupertypes(D2, {
           A: [D2_T],
           B: [
@@ -198,7 +200,7 @@ void testNonTrivialSubstitutions() {
           ]
         });
 
-        DartType F1_T = F1.typeVariables.first;
+        ResolutionDartType F1_T = F1.typeVariables.first;
         testSupertypes(F1, {
           A: [_],
           B: [
@@ -206,7 +208,7 @@ void testNonTrivialSubstitutions() {
             instantiate(B, [F1_T, _])
           ]
         });
-        DartType F1_superclass_T = F1.superclass.typeVariables.first;
+        ResolutionDartType F1_superclass_T = F1.superclass.typeVariables.first;
         testSupertypes(F1.superclass, {
           A: [_],
           B: [
@@ -214,7 +216,7 @@ void testNonTrivialSubstitutions() {
             instantiate(B, [F1_superclass_T, _])
           ]
         });
-        DartType F2_T = F2.typeVariables.first;
+        ResolutionDartType F2_T = F2.typeVariables.first;
         testSupertypes(F2, {
           A: [_],
           B: [