Move back to having File.open{Input,Output}Stream return the stream directly.

runtime/bin/file_impl.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.
 
 class _FileInputStream extends _BaseDataInputStream implements InputStream {
   _FileInputStream(String name) {
     _file = new File(name);
     _data = [];
     _position = 0;
     _file.errorHandler = (String s) {
@@ skipping 496 matching lines @@
       throw new FileIOException(
           "Mixed use of synchronous and asynchronous API");
     }
     String result = _FileUtils.checkedFullPath(_name);
     if (result == null) {
       throw new FileIOException("fullPath failed");
     }
     return result;
   }
 
-  void openInputStream() {
-    _asyncUsed = true;
-    // Create a new file object to handle the opening of the file for
-    // creating an input stream. Currently the file input stream uses
-    // synchronous calls on the opened file so we need to open it
-    // synchronously.
-    new Timer((t) {
-      if (_inputStreamHandler != null) {
-        _inputStreamHandler(new _FileInputStream(_name));
-      }
-    }, 0);
-  }
-
-  InputStream openInputStreamSync() {
+  InputStream openInputStream() {
     return new _FileInputStream(_name);
   }
 
-  void openOutputStream([FileMode mode = FileMode.WRITE]) {
-    _asyncUsed = true;
+  OutputStream openOutputStream([FileMode mode = FileMode.WRITE]) {
     if (mode != FileMode.WRITE &&
         mode != FileMode.APPEND) {
       throw new FileIOException(
-          "Wrong FileMode. Use FileMode.WRITE or FileMode.APPEND");
-    }
-    OutputStream stream = new _FileOutputStream(_name, mode);
-    new Timer(
-        (Timer ignore) {
-          if (_outputStreamHandler != null) _outputStreamHandler(stream);
-        }, 0);
-  }
-
-  OutputStream openOutputStreamSync([FileMode mode = FileMode.WRITE]) {
-    if (_asyncUsed) {
-      throw new FileIOException(
-          "Mixed use of synchronous and asynchronous API");
-    }
-    if (mode != FileMode.WRITE &&
-        mode != FileMode.APPEND) {
-      throw new FileIOException(
           "Wrong FileMode. Use FileMode.WRITE or FileMode.APPEND");
     }
     return new _FileOutputStream(_name, mode);
   }
 
   void readAsBytes() {
     _asyncUsed = true;
     var chunks = new _BufferList();
-    var stream = openInputStreamSync();
+    var stream = openInputStream();
     stream.closeHandler = () {
       if (_readAsBytesHandler != null) {
         _readAsBytesHandler(chunks.readBytes(chunks.length));
       }
     };
     stream.dataHandler = () {
       var chunk = stream.read();
       chunks.add(chunk);
     };
     stream.errorHandler = () {
@@ skipping 121 matching lines @@
   }
 
   void set directoryHandler(void handler(Directory directory)) {
     _directoryHandler = handler;
   }
 
   void set openHandler(void handler(RandomAccessFile file)) {
     _openHandler = handler;
   }
 
-  void set inputStreamHandler(void handler(InputStream stream)) {
-    _inputStreamHandler = handler;
-  }
-
-  void set outputStreamHandler(void handler(OutputStream stream)) {
-    _outputStreamHandler = handler;
-  }
-
   void set readAsBytesHandler(void handler(List<int> bytes)) {
     _readAsBytesHandler = handler;
   }
 
   void set readAsTextHandler(void handler(String text)) {
     _readAsTextHandler = handler;
   }
 
   void set readAsLinesHandler(void handler(List<String> lines)) {
     _readAsLinesHandler = handler;
@@ skipping 16 matching lines @@
   String _name;
   bool _asyncUsed;
 
   SendPort _fileService;
 
   Function _existsHandler;
   Function _createHandler;
   Function _deleteHandler;
   Function _directoryHandler;
   Function _openHandler;
-  Function _inputStreamHandler;
-  Function _outputStreamHandler;
   Function _readAsBytesHandler;
   Function _readAsTextHandler;
   Function _readAsLinesHandler;
   Function _fullPathHandler;
   Function _errorHandler;
 }
 
 
 class _RandomAccessFile implements RandomAccessFile {
   _RandomAccessFile(int this._id, String this._name) : _asyncUsed = false;
@@ skipping 437 matching lines @@
   Function _readByteHandler;
   Function _readListHandler;
   Function _noPendingWriteHandler;
   Function _positionHandler;
   Function _setPositionHandler;
   Function _truncateHandler;
   Function _lengthHandler;
   Function _flushHandler;
   Function _errorHandler;
 }