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

runtime/bin/file.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.
 
 
 /**
  * FileMode describes the modes in which a file can be opened.
  */
 class FileMode {
   static final READ = const FileMode(0);
@@ skipping 111 matching lines @@
   void fullPath();
 
   /**
    * Synchronously get the canonical full path corresponding to the file name.
    */
   String fullPathSync();
 
   /**
    * Create a new independent input stream for the file. The file
    * input stream must be closed when no longer used to free up system
-   * resources.  The [inputStreamHandler] is called with the result
-   * when the openInputStream operation completes.
+   * resources.
    */
-  void openInputStream();
-
-  /**
-   * Synchronously create a new independent input stream for the
-   * file. The file input stream must be closed when no longer used to
-   * free up system resources.
-   *
-   * Even though this call to open the input stream is synchronous the
-   * input stream itself is asynchronous as is the case for all input
-   * streams.
-   */
-  InputStream openInputStreamSync();
+  InputStream openInputStream();
 
   /**
    * Creates a new independent output stream for the file. The file
    * output stream must be closed when no longer used to free up
-   * system resources.  The [outputStreamHandler] is called with the result
-   * when the openOutputStream operation completes.
+   * system resources.
    *
    * An output stream can be opened in two modes:
    *
    * FileMode.WRITE: create the stream and truncate the underlying
    * file to length zero.
    *
    * FileMode.APPEND: create the stream and set the position to the end of
    * the underlying file.
    *
    * By default the mode is FileMode.WRITE.
    */
-  void openOutputStream([FileMode mode]);
-
-  /**
-   * Synchronously creates a new independent output stream for the
-   * file. The file output stream must be closed when no longer used
-   * to free up system resources.
-   *
-   * See [openOutputStream] for information on the [:mode:] argument.
-   *
-   * Even though this call to open the output stream is synchronous
-   * the output stream itself is asynchronous as is the case for all
-   * output streams.
-   */
-  OutputStream openOutputStreamSync([FileMode mode]);
+  OutputStream openOutputStream([FileMode mode]);
 
   /**
    * Read the entire file contents as a list of bytes. When the
    * operation completes the [readAsBytesHandler] is called.
    * The [errorHandler] is called if the operation fails.
    */
   void readAsBytes();
 
   /**
    * Synchronously read the entire file contents as a list of bytes.
@@ skipping 65 matching lines @@
    */
   void set directoryHandler(void handler(Directory directory));
 
   /**
    * Sets the handler that gets called when an [open] operation
    * completes.
    */
   void set openHandler(void handler(RandomAccessFile openedFile));
 
   /**
-   * Sets the handler that gets called when an [openInputStream]
-   * operation completes.
-   */
-  void set inputStreamHandler(void handler(InputStream stream));
-
-  /**
-   * Sets the handler that gets called when an [openOutputStream]
-   * operation completes.
-   */
-  void set outputStreamHandler(void handler(OutputStream stream));
-
-  /**
    * Set the handler that gets called when a [readAsBytes] operation
    * completes.
    */
   void set readAsBytesHandler(void handler(List<int> bytes));
 
   /**
    * Set the handler that gets called when a [readAsText] operation
    * completes.
    */
   void set readAsTextHandler(void handler(String text));
@@ skipping 220 matching lines @@
    */
   void set errorHandler(void handler(String error));
 }
 
 
 class FileIOException implements Exception {
   const FileIOException([String this.message = ""]);
   String toString() => "FileIOException: $message";
   final String message;
 }