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

runtime/bin/file.dart

Index: runtime/bin/file.dart
diff --git a/runtime/bin/file.dart b/runtime/bin/file.dart
index f48d9993eb04a5c282d0bc3822113b3bb666ca6c..8b36398de65da86d82731cea87e09aea0da6955f 100644
--- a/runtime/bin/file.dart
+++ b/runtime/bin/file.dart
@@ -129,27 +129,14 @@ interface File default _File {
   /**
    * 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:
    *
@@ -161,20 +148,7 @@ interface File default _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
@@ -260,18 +234,6 @@ interface File default _File {
   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.
    */