Refactor CompilerOutput

tests/compiler/dart2js/sourcemaps/sourcemap_helper.dart

Index: tests/compiler/dart2js/sourcemaps/sourcemap_helper.dart
diff --git a/tests/compiler/dart2js/sourcemaps/sourcemap_helper.dart b/tests/compiler/dart2js/sourcemaps/sourcemap_helper.dart
index 3c5ab62ebc425bc46da6c0102c5096cca3bfb7e3..c98dfff45c5d51b18d5db09aea6908dcb56fd221 100644
--- a/tests/compiler/dart2js/sourcemaps/sourcemap_helper.dart
+++ b/tests/compiler/dart2js/sourcemaps/sourcemap_helper.dart
@@ -25,7 +25,7 @@ import 'package:compiler/src/source_file_provider.dart';
 import '../memory_compiler.dart';
 import '../output_collector.dart';
 
-class SourceFileSink implements EventSink<String> {
+class SourceFileSink implements OutputSink {
   final String filename;
   StringBuffer sb = new StringBuffer();
   SourceFile sourceFile;
@@ -38,11 +38,6 @@ class SourceFileSink implements EventSink<String> {
   }
 
   @override
-  void addError(errorEvent, [StackTrace stackTrace]) {
-    // Ignore.
-  }
-
-  @override
   void close() {
     sourceFile = new StringSourceFile.fromName(filename, sb.toString());
   }
@@ -59,7 +54,8 @@ class OutputProvider implements CompilerOutput {
     return null;
   }
 
-  SourceFileSink createSourceFileSink(String name, String extension) {
+  SourceFileSink createSourceFileSink(
+      String name, String extension, OutputType type) {
     String filename = '$name.$extension';
     SourceFileSink sink = new SourceFileSink(filename);
     Uri uri = Uri.parse(filename);
@@ -68,8 +64,8 @@ class OutputProvider implements CompilerOutput {
   }
 
   @override
-  EventSink<String> createEventSink(String name, String extension) {
-    return createSourceFileSink(name, extension);
+  OutputSink createOutputSink(String name, String extension, OutputType type) {
+    return createSourceFileSink(name, extension, type);
   }
 }
 
@@ -80,10 +76,10 @@ class CloningOutputProvider extends OutputProvider {
       : outputProvider = new RandomAccessFileOutputProvider(jsUri, jsMapUri);
 
   @override
-  EventSink<String> createEventSink(String name, String extension) {
-    EventSink<String> output = outputProvider(name, extension);
-    return new CloningEventSink(
-        [output, createSourceFileSink(name, extension)]);
+  OutputSink createOutputSink(String name, String extension, OutputType type) {
+    OutputSink output = outputProvider.createOutputSink(name, extension, type);
+    return new CloningOutputSink(
+        [output, createSourceFileSink(name, extension, type)]);
   }
 }