Change TypeMask.base to be a ClassElement.

tests/compiler/dart2js/simple_inferrer_test.dart

 // Copyright (c) 2013, 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.
 
 import 'package:expect/expect.dart';
 import "package:async_helper/async_helper.dart";
 import
     '../../../sdk/lib/_internal/compiler/implementation/types/types.dart'
     show TypeMask;
 
@@ skipping 674 matching lines @@
     checkReturn('returnInt5', typesTask.intType);
     checkReturn('returnInt6', typesTask.intType);
     checkReturn('returnIntOrNull', typesTask.intType.nullable());
     checkReturn('returnInt3', typesTask.intType);
     checkReturn('returnDynamic', typesTask.dynamicType);
     checkReturn('returnInt4', typesTask.intType);
     checkReturn('returnInt7', typesTask.intType);
     checkReturn('returnInt8', typesTask.intType);
     checkReturn('returnEmpty1', const TypeMask.nonNullEmpty());
     checkReturn('returnEmpty2', const TypeMask.nonNullEmpty());
-    TypeMask intType = new TypeMask.nonNullSubtype(compiler.intClass.rawType);
+    TypeMask intType = new TypeMask.nonNullSubtype(compiler.intClass);
     checkReturn('testIsCheck1', intType);
     checkReturn('testIsCheck2', intType);
     checkReturn('testIsCheck3', intType.nullable());
     checkReturn('testIsCheck4', intType);
     checkReturn('testIsCheck5', intType);
     checkReturn('testIsCheck6', typesTask.dynamicType);
     checkReturn('testIsCheck7', intType);
     checkReturn('testIsCheck8', typesTask.dynamicType);
     checkReturn('testIsCheck9', intType);
     checkReturn('testIsCheck10', typesTask.dynamicType);
@@ skipping 12 matching lines @@
     checkReturn('testIsCheck23', intType);
     checkReturn('testIsCheck24', intType);
     checkReturn('testIsCheck25', typesTask.dynamicType);
     checkReturn('testIsCheck26', intType);
     checkReturn('testIsCheck27', intType);
     checkReturn('testIsCheck28', typesTask.dynamicType);
     checkReturn('testIsCheck29', typesTask.dynamicType);
     checkReturn('testIf1', typesTask.intType.nullable());
     checkReturn('testIf2', typesTask.intType.nullable());
     checkReturn('returnAsString',
-        new TypeMask.subtype(compiler.stringClass.computeType(compiler)));
+        new TypeMask.subtype(compiler.stringClass));
     checkReturn('returnIntAsNum', typesTask.intType);
     checkReturn('returnAsTypedef', typesTask.functionType.nullable());
     checkReturn('returnTopLevelGetter', typesTask.intType);
     checkReturn('testDeadCode', typesTask.intType);
     checkReturn('testLabeledIf', typesTask.intType.nullable());
     checkReturn('testSwitch1', typesTask.intType
         .union(typesTask.doubleType, compiler)
         .nullable().simplify(compiler));
     checkReturn('testSwitch2', typesTask.intType);
     checkReturn('testSwitch3', interceptorType.nullable());
@@ skipping 34 matching lines @@
     checkReturnInClass('B', 'returnInt4', typesTask.intType);
     checkReturnInClass('B', 'returnInt5', typesTask.intType);
     checkReturnInClass('B', 'returnInt6', typesTask.intType);
     checkReturnInClass('B', 'returnInt7', typesTask.intType);
     checkReturnInClass('B', 'returnInt8', typesTask.intType);
     checkReturnInClass('B', 'returnInt9', typesTask.intType);
 
     checkFactoryConstructor(String className, String factoryName) {
       var cls = findElement(compiler, className);
       var element = cls.localLookup(buildSourceString(factoryName));
-      Expect.equals(new TypeMask.nonNullExact(cls.rawType),
+      Expect.equals(new TypeMask.nonNullExact(cls),
                     typesInferrer.getReturnTypeOfElement(element));
     }
     checkFactoryConstructor('A', '');
 
     checkReturn('testCascade1', typesTask.growableListType);
     checkReturn('testCascade2', new TypeMask.nonNullExact(
-        findElement(compiler, 'CascadeHelper').rawType));
+        findElement(compiler, 'CascadeHelper')));
     checkReturn('testSpecialization1', typesTask.numType);
     checkReturn('testSpecialization2', typesTask.dynamicType);
     checkReturn('testSpecialization3', typesTask.intType.nullable());
   }));
 }