Remove Sink and move CollectionSink to async.

sdk/lib/_internal/compiler/implementation/dart2js.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 dart2js;
 
 import 'dart:async';
 import 'dart:collection' show Queue, LinkedHashMap;
 import 'dart:io';
 import 'dart:uri';
@@ skipping 245 matching lines @@
          'compiled ${inputProvider.dartCharactersRead} characters Dart '
          '-> $charactersWritten characters $outputLanguage '
          'in ${relativize(cwd, out, isWindows)}');
     if (!explicitOut) {
       String input = uriPathToNative(arguments[0]);
       String output = relativize(cwd, out, isWindows);
       print('Dart file $input compiled to $outputLanguage: $output');
     }
   }
 
-  Sink<String> outputProvider(String name, String extension) {
+  StreamSink<String> outputProvider(String name, String extension) {
     Uri uri;
     String sourceMapFileName;
     bool isPrimaryOutput = false;
     if (name == '') {
       if (extension == 'js' || extension == 'dart') {
         isPrimaryOutput = true;
         uri = out;
         sourceMapFileName =
             sourceMapOut.path.substring(sourceMapOut.path.lastIndexOf('/') + 1);
       } else if (extension == 'js.map' || extension == 'dart.map') {
@@ skipping 30 matching lines @@
     return sink;
   }
 
   api.compile(uri, libraryRoot, packageRoot,
               inputProvider.readStringFromUri, handler,
               options, outputProvider)
       .then(compilationDone);
 }
 
 // TODO(ahe): Get rid of this class if http://dartbug.com/8118 is fixed.
-class CountingSink implements Sink<String> {
-  final Sink<String> sink;
+class CountingSink implements StreamSink<String> {
+  final StreamSink<String> sink;
   int count = 0;
 
   CountingSink(this.sink);
 
   add(String value) {
     sink.add(value);
     count += value.length;
   }
 
+  signalError(AsyncError error) => sink.signalError(error);
+
   close() => sink.close();
 }
 
 class AbortLeg {
   final message;
   AbortLeg(this.message);
   toString() => 'Aborted due to --throw-on-error: $message';
 }
 
 void writeString(Uri uri, String text) {
@@ skipping 149 matching lines @@
     } catch (ignored) {
       print('Internal error: error while printing exception');
     }
     try {
       print(trace);
     } finally {
       exit(253); // 253 is recognized as a crash by our test scripts.
     }
   }
 }