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

tests/standalone/src/FileTest.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.
 //
 // Dart test program for testing file I/O.
 
 #import("dart:io");
 #import("dart:isolate");
 
 class MyListOfOneElement implements List {
@@ skipping 26 matching lines @@
 
   static void deleteTempDirectory() {
     tempDirectory.deleteSync(recursive: true);
   }
 
   // Test for file read functionality.
   static void testReadStream() {
     // Read a file and check part of it's contents.
     String filename = getFilename("bin/file_test.cc");
     File file = new File(filename);
-    InputStream input = file.openInputStreamSync();
+    InputStream input = file.openInputStream();
     input.dataHandler = () {
       List<int> buffer = new List<int>(42);
       int bytesRead = input.readInto(buffer, 0, 12);
       Expect.equals(12, bytesRead);
       bytesRead = input.readInto(buffer, 12, 30);
       input.close();
       Expect.equals(30, bytesRead);
       Expect.equals(47, buffer[0]);  // represents '/' in the file.
       Expect.equals(47, buffer[1]);  // represents '/' in the file.
       Expect.equals(32, buffer[2]);  // represents ' ' in the file.
@@ skipping 14 matching lines @@
     asyncTestStarted();
 
     // Read a file.
     String inFilename = getFilename("tests/vm/data/fixed_length_file");
     File file;
     InputStream input;
     int bytesRead;
 
     // Test reading all using readInto.
     file = new File(inFilename);
-    input = file.openInputStreamSync();
+    input = file.openInputStream();
     input.dataHandler = () {
       List<int> buffer1 = new List<int>(42);
       bytesRead = input.readInto(buffer1, 0, 42);
       Expect.equals(42, bytesRead);
       Expect.isTrue(input.closed);
 
       // Test reading all using readInto and read.
       file = new File(inFilename);
-      input = file.openInputStreamSync();
+      input = file.openInputStream();
       input.dataHandler = () {
         bytesRead = input.readInto(buffer1, 0, 21);
         Expect.equals(21, bytesRead);
         buffer1 = input.read();
         Expect.equals(21, buffer1.length);
         Expect.isTrue(input.closed);
 
         // Test reading all using read and readInto.
         file = new File(inFilename);
-        input = file.openInputStreamSync();
+        input = file.openInputStream();
         input.dataHandler = () {
           buffer1 = input.read(21);
           Expect.equals(21, buffer1.length);
           bytesRead = input.readInto(buffer1, 0, 21);
           Expect.equals(21, bytesRead);
           Expect.isTrue(input.closed);
 
           // Test reading all using read.
           file = new File(inFilename);
-          input = file.openInputStreamSync();
+          input = file.openInputStream();
           input.dataHandler = () {
             buffer1 = input.read();
             Expect.equals(42, buffer1.length);
             Expect.isTrue(input.closed);
 
             // Write the contents of the file just read into another file.
             String outFilename = tempDirectory.path + "/out_read_write_stream";
             file = new File(outFilename);
-            OutputStream output = file.openOutputStreamSync();
+            OutputStream output = file.openOutputStream();
             bool writeDone = output.writeFrom(buffer1, 0, 42);
             Expect.equals(false, writeDone);
             output.noPendingWriteHandler = () {
               output.close();
 
               // Now read the contents of the file just written.
               List<int> buffer2 = new List<int>(42);
               file = new File(outFilename);
-              input = file.openInputStreamSync();
+              input = file.openInputStream();
               input.dataHandler = () {
                 bytesRead = input.readInto(buffer2, 0, 42);
                 Expect.isTrue(input.closed);
                 Expect.equals(42, bytesRead);
                 // Now compare the two buffers to check if they are identical.
                 for (int i = 0; i < buffer1.length; i++) {
                   Expect.equals(buffer1[i],  buffer2[i]);
                 }
                 // Delete the output file.
                 file.deleteSync();
@@ skipping 173 matching lines @@
     openedFile.closeSync();
     file.deleteSync();
   }
 
   static void testOutputStreamWriteAppend() {
     String content = "foobar";
     String filename = tempDirectory.path + "/outstream_write_append";
     File file = new File(filename);
     file.createSync();
     List<int> buffer = content.charCodes();
-    OutputStream outStream = file.openOutputStreamSync();
+    OutputStream outStream = file.openOutputStream();
     outStream.write(buffer);
     outStream.noPendingWriteHandler = () {
       outStream.close();
       File file2 = new File(filename);
       OutputStream appendingOutput =
-          file2.openOutputStreamSync(FileMode.APPEND);
+          file2.openOutputStream(FileMode.APPEND);
       appendingOutput.write(buffer);
       appendingOutput.noPendingWriteHandler = () {
         appendingOutput.close();
         File file3 = new File(filename);
         file3.openHandler = (RandomAccessFile openedFile) {
           openedFile.lengthHandler = (int length) {
             Expect.equals(content.length * 2, length);
             openedFile.closeHandler = () {
               file3.deleteHandler = () {
                 asyncTestDone("testOutputStreamWriteAppend");
@@ skipping 417 matching lines @@
     Expect.equals(true, !wrongExceptionCaught);
     input.deleteSync();
   }
 
   // Tests stream exception handling after file was closed.
   static void testCloseExceptionStream() {
     asyncTestStarted();
     List<int> buffer = new List<int>(42);
     File file = new File(tempDirectory.path + "/out_close_exception_stream");
     file.createSync();
-    InputStream input = file.openInputStreamSync();
+    InputStream input = file.openInputStream();
     input.closeHandler = () {
       Expect.isTrue(input.closed);
       Expect.isNull(input.readInto(buffer, 0, 12));
-      OutputStream output = file.openOutputStreamSync();
+      OutputStream output = file.openOutputStream();
       output.close();
       Expect.throws(() => output.writeFrom(buffer, 0, 12));
       output.closeHandler = () {
         file.deleteSync();
         asyncTestDone("testCloseExceptionStream");
       };
     };
   }
 
   // Tests buffer out of bounds exception.
@@ skipping 364 matching lines @@
       testWriteVariousLists();
       testDirectory();
       testDirectorySync();
     });
   }
 }
 
 main() {
   FileTest.testMain();
 }