Move TypeMask.simplify to a test helper.

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;
+import 'type_mask_test_helper.dart';
 
 import 'compiler_helper.dart';
 import 'parser_helper.dart';
+import 'type_mask_test_helper.dart';
 
 const String TEST = """
 returnNum1(a) {
   if (a) return 1;
   else return 2.5;
 }
 
 returnNum2(a) {
   if (a) return 1.4;
   else return 2;
@@ skipping 684 matching lines @@
   Uri uri = new Uri(scheme: 'source');
   var compiler = compilerFor(TEST, uri);
   asyncTest(() => compiler.runCompiler(uri).then((_) {
     var typesTask = compiler.typesTask;
     var typesInferrer = typesTask.typesInferrer;
 
     checkReturn(String name, type) {
       var element = findElement(compiler, name);
       Expect.equals(
           type,
-          typesInferrer.getReturnTypeOfElement(element).simplify(compiler),
+          simplify(typesInferrer.getReturnTypeOfElement(element), compiler),
           name);
     }
     var interceptorType =
         findTypeMask(compiler, 'Interceptor', 'nonNullSubclass');
 
     checkReturn('returnNum1', typesTask.numType);
     checkReturn('returnNum2', typesTask.numType);
     checkReturn('returnInt1', typesTask.uint31Type);
     checkReturn('returnInt2', typesTask.uint31Type);
     checkReturn('returnDouble', typesTask.doubleType);
@@ skipping 40 matching lines @@
     checkReturn('testIsCheck29', typesTask.dynamicType);
     checkReturn('testIf1', typesTask.uint31Type.nullable());
     checkReturn('testIf2', typesTask.uint31Type.nullable());
     checkReturn('returnAsString',
         new TypeMask.subtype(compiler.stringClass));
     checkReturn('returnIntAsNum', typesTask.uint31Type);
     checkReturn('returnAsTypedef', typesTask.functionType.nullable());
     checkReturn('returnTopLevelGetter', typesTask.uint31Type);
     checkReturn('testDeadCode', typesTask.uint31Type);
     checkReturn('testLabeledIf', typesTask.uint31Type.nullable());
-    checkReturn('testSwitch1', typesTask.intType
-        .union(typesTask.doubleType, compiler)
-        .nullable().simplify(compiler));
+    checkReturn('testSwitch1', simplify(
+        typesTask.intType
+            .union(typesTask.doubleType, compiler)
+            .nullable(),
+        compiler));
     checkReturn('testSwitch2', typesTask.uint31Type);
     checkReturn('testSwitch3', interceptorType.nullable());
     checkReturn('testSwitch4', typesTask.uint31Type);
     checkReturn('testSwitch5', typesTask.uint31Type);
     checkReturn('testContinue1', interceptorType.nullable());
     checkReturn('testBreak1', interceptorType.nullable());
     checkReturn('testContinue2', interceptorType.nullable());
     checkReturn('testBreak2', typesTask.positiveIntType.nullable());
     checkReturn('testReturnElementOfConstList1', typesTask.uint31Type);
     checkReturn('testReturnElementOfConstList2', typesTask.uint31Type);
     checkReturn('testReturnItselfOrInt', typesTask.uint31Type);
     checkReturn('testReturnInvokeDynamicGetter', typesTask.dynamicType);
 
     checkReturn('testDoWhile1', typesTask.stringType);
     checkReturn('testDoWhile2', typesTask.nullType);
     checkReturn('testDoWhile3', typesTask.uint31Type);
     checkReturn('testDoWhile4', typesTask.numType);
 
     checkReturnInClass(String className, String methodName, type) {
       var cls = findElement(compiler, className);
       var element = cls.lookupLocalMember(methodName);
       Expect.equals(type,
-          typesInferrer.getReturnTypeOfElement(element).simplify(compiler),
+          simplify(typesInferrer.getReturnTypeOfElement(element), compiler),
           '$className:$methodName');
     }
 
     checkReturnInClass('A', 'returnInt1', typesTask.positiveIntType);
     checkReturnInClass('A', 'returnInt2', typesTask.positiveIntType);
     checkReturnInClass('A', 'returnInt3', typesTask.positiveIntType);
     checkReturnInClass('A', 'returnInt4', typesTask.positiveIntType);
     checkReturnInClass('A', 'returnInt5', typesTask.positiveIntType);
     checkReturnInClass('A', 'returnInt6', typesTask.positiveIntType);
     checkReturnInClass('A', '==', interceptorType);
@@ skipping 24 matching lines @@
     checkReturn('testSpecialization3', typesTask.uint31Type.nullable());
     checkReturn('testReturnNull1', typesTask.nullType);
     checkReturn('testReturnNull2', typesTask.nullType);
     checkReturn('testReturnNull3', typesTask.dynamicType);
     checkReturn('testReturnNull4', typesTask.nullType);
     checkReturn('testReturnNull5', typesTask.nullType);
     checkReturn('testReturnNull6', typesTask.dynamicType);
     checkReturn('testReturnNotEquals', typesTask.boolType);
   }));
 }