Refactor CompilerOutput

tests/compiler/dart2js/compiler_helper.dart

 // 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.
 
 library compiler_helper;
 
 import 'dart:async';
 import "package:expect/expect.dart";
 
+import 'package:compiler/compiler_new.dart';
+
 import 'package:compiler/src/elements/elements.dart' as lego;
 export 'package:compiler/src/elements/elements.dart';
 
 import 'package:compiler/src/js_backend/js_backend.dart' as js;
 
 import 'package:compiler/src/commandline_options.dart';
 import 'package:compiler/src/common/codegen.dart';
 import 'package:compiler/src/common/resolution.dart';
 
 export 'package:compiler/src/diagnostics/messages.dart';
@@ skipping 60 matching lines @@
     resolutionWork.run();
     compiler.closeResolution();
     CodegenWorkItem work = new CodegenWorkItem(compiler.backend, element);
     compiler.phase = Compiler.PHASE_COMPILING;
     work.run();
     js.JavaScriptBackend backend = compiler.backend;
     String generated = backend.getGeneratedCode(element);
     if (check != null) {
       check(generated);
     }
-    return returnAll ? outputCollector.getOutput('', 'js') : generated;
+    return returnAll ? outputCollector.getOutput('', OutputType.js) : generated;
   } else {
     List<String> options = <String>[Flags.disableTypeInference];
     if (enableTypeAssertions) {
       options.add(Flags.enableCheckedMode);
     }
     if (minify) {
       options.add(Flags.minify);
     }
     if (analyzeAll) {
       options.add(Flags.analyzeAll);
@@ skipping 18 matching lines @@
         options: options,
         outputProvider: outputCollector);
     Expect.isTrue(result.isSuccess);
     Compiler compiler = result.compiler;
     lego.Element element = compiler.mainApp.find(entry);
     js.JavaScriptBackend backend = compiler.backend;
     String generated = backend.getGeneratedCode(element);
     if (check != null) {
       check(generated);
     }
-    return returnAll ? outputCollector.getOutput('', 'js') : generated;
+    return returnAll ? outputCollector.getOutput('', OutputType.js) : generated;
   }
 }
 
 Future<String> compileAll(String code,
     {Map<String, String> coreSource,
     bool disableInlining: true,
     bool trustTypeAnnotations: false,
     bool minify: false,
     int expectedErrors,
     int expectedWarnings}) {
   Uri uri = new Uri(scheme: 'source');
   OutputCollector outputCollector = new OutputCollector();
   MockCompiler compiler = compilerFor(code, uri,
       coreSource: coreSource,
       disableInlining: disableInlining,
       minify: minify,
       expectedErrors: expectedErrors,
       trustTypeAnnotations: trustTypeAnnotations,
       expectedWarnings: expectedWarnings,
       outputProvider: outputCollector);
   compiler.diagnosticHandler = createHandler(compiler, code);
   return compiler.run(uri).then((compilationSucceded) {
     Expect.isTrue(
         compilationSucceded,
         'Unexpected compilation error(s): '
         '${compiler.diagnosticCollector.errors}');
-    return outputCollector.getOutput('', 'js');
+    return outputCollector.getOutput('', OutputType.js);
   });
 }
 
 Future compileAndCheck(String code, String name,
     check(MockCompiler compiler, lego.Element element),
     {int expectedErrors, int expectedWarnings}) {
   Uri uri = new Uri(scheme: 'source');
   MockCompiler compiler = compilerFor(code, uri,
       expectedErrors: expectedErrors, expectedWarnings: expectedWarnings);
   return compiler.run(uri).then((_) {
@@ skipping 122 matching lines @@
     }
   }
 
   return checker;
 }
 
 RegExp _directivePattern = new RegExp(
     //      \1                     \2        \3
     r'''// *(present|absent): *(?:"([^"]*)"|'([^'']*)')''',
     multiLine: true);