Refactor CompilerOutput

tests/compiler/dart2js/serialization/helper.dart

 // Copyright (c) 2016, 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 dart2js.serialization_helper;
 
 import 'dart:async';
 import 'dart:io';
 
+import 'package:compiler/compiler_new.dart';
 import 'package:compiler/src/commandline_options.dart';
 import 'package:compiler/src/common/names.dart';
 import 'package:compiler/src/compiler.dart';
 import 'package:compiler/src/elements/elements.dart';
 import 'package:compiler/src/filenames.dart';
 
 import '../memory_compiler.dart';
 import 'test_data.dart';
 
 const String DEFAULT_DATA_FILE_NAME = 'out.data';
@@ skipping 141 matching lines @@
   }
   OutputCollector outputCollector = new OutputCollector();
   Compiler compiler = compilerFor(
       options: [Flags.resolveOnly],
       memorySourceFiles: memorySourceFiles,
       resolutionInputs: resolutionInputs,
       outputProvider: outputCollector);
   compiler.serialization.deserializeCompilationDataForTesting =
       deserializeCompilationDataForTesting;
   await compiler.run(entryPoint);
-  SerializedData serializedData =
-      new SerializedData(dataUri, outputCollector.getOutput('', 'data'));
+  SerializedData serializedData = new SerializedData(
+      dataUri, outputCollector.getOutput('', OutputType.serializationData));
   return new SerializationResult(compiler, serializedData);
 }
 
 class SerializedData {
   final Uri uri;
   final String data;
 
   SerializedData(this.uri, this.data) {
     assert(uri != null);
     assert(data != null);
@@ skipping 60 matching lines @@
         memorySourceFiles: sourceFiles,
         resolutionInputs: serializedData.toUris(),
         options: [Flags.resolveOnly],
         outputProvider: outputCollector);
     compiler.librariesToAnalyzeWhenRun = uriList;
     await compiler.run(null);
     List<LibraryElement> libraries = <LibraryElement>[];
     for (Uri uri in uriList) {
       libraries.add(compiler.libraryLoader.lookupLibrary(uri));
     }
-    additionalSerializedData = new SerializedData(
-        additionalDataUri, outputCollector.getOutput('', 'data'));
+    additionalSerializedData = new SerializedData(additionalDataUri,
+        outputCollector.getOutput('', OutputType.serializationData));
   }
   return <SerializedData>[serializedData, additionalSerializedData];
 }
 
 class MeasurementResult {
   final String title;
   final String taskTitle;
   final int elapsedMilliseconds;
 
   MeasurementResult(this.title, this.taskTitle, this.elapsedMilliseconds);
@@ skipping 39 matching lines @@
   print('$taskTitle: $title');
   print('----------------------------------------------------------------');
   var result = await task();
   stopwatch.stop();
   int elapsedMilliseconds = stopwatch.elapsedMilliseconds;
   print('$taskTitle: $title: ${elapsedMilliseconds}ms');
   measurementResults
       .add(new MeasurementResult(title, taskTitle, elapsedMilliseconds));
   return result;
 }