Revert 20127

tests/html/fileapi_test.dart

 library fileapi;
 import '../../pkg/unittest/lib/unittest.dart';
 import '../../pkg/unittest/lib/html_individual_config.dart';
 import 'dart:html';
 import 'dart:async';
 
 class FileAndDir {
   FileEntry file;
   DirectoryEntry dir;
   FileAndDir(this.file, this.dir);
@@ skipping 25 matching lines @@
       }, expectation);
     });
   });
 
   group('getDirectory', () {
     if (FileSystem.supported) {
       test('getFileSystem', getFileSystem);
 
       test('directoryDoesntExist', () {
         return fs.root.getDirectory(
-            'directory2')
+            'directory2',
+            options: {})
               .catchError((e) {
                 expect(e.error.code, equals(FileError.NOT_FOUND_ERR));
               }, test: (e) => e is FileError);
         });
 
       test('directoryCreate', () {
-        return fs.root.createDirectory(
-            'directory3')
+        return fs.root.getDirectory(
+            'directory3',
+            options: {'create': true})
               .then((DirectoryEntry e) {
                 expect(e.name, equals('directory3'));
               });
         });
     }
   });
 
   group('getFile', () {
     if (FileSystem.supported) {
       test('getFileSystem', getFileSystem);
 
       test('fileDoesntExist', () {
         return fs.root.getFile(
-            'file2')
+            'file2',
+            options: {})
           .catchError((e) {
             expect(e.error.code, equals(FileError.NOT_FOUND_ERR));
           }, test: (e) => e is FileError);
       });
 
       test('fileCreate', () {
-        return fs.root.createFile(
-            'file4')
+        return fs.root.getFile(
+            'file4',
+            options: {'create': true})
           .then((FileEntry e) {
             expect(e.name, equals('file4'));
             expect(e.isFile, isTrue);
             return e.getMetadata();
           }).then((Metadata metadata) {
             var changeTime = metadata.modificationTime;
             // Upped because our Windows buildbots can sometimes be particularly
             // slow.
             expect(new DateTime.now().difference(changeTime).inMinutes,
                 lessThan(4));
             expect(metadata.size, equals(0));
           });
         });
     }
   });
 
   // Do the boilerplate to get several files and directories created to then
   // test the functions that use those items.
   Future doDirSetup() {
-    return fs.root.createFile(
-      'file4')
+    return fs.root.getFile(
+      'file4',
+      options: {'create': true})
         .then((FileEntry file) {
-          return fs.root.createDirectory(
-              'directory3')
+          return fs.root.getDirectory(
+              'directory3',
+              options: {'create': true})
             .then((DirectoryEntry dir) {
               return new Future.immediate(new FileAndDir(file, dir));
             });
         });
   }
 
   group('directoryReader', () {
     if (FileSystem.supported) {
       test('getFileSystem', getFileSystem);
 
@@ skipping 33 matching lines @@
           });
       });
 
       test('moveTo', () {
         return doDirSetup()
           .then((fileAndDir) {
             return fileAndDir.file.moveTo(fileAndDir.dir, name: 'movedFile');
           }).then((entry) {
             expect(entry.name, 'movedFile');
             expect(entry.fullPath, '/directory3/movedFile');
-            return fs.root.getFile('file4');
+            return fs.root.getFile('file4', options: {'create': false});
           }).catchError((e) {
             expect(e.error.code, equals(FileError.NOT_FOUND_ERR));
           }, test: (e) => e is FileError);
       });
 
       test('remove', () {
         return doDirSetup()
           .then((fileAndDir) {
             return fileAndDir.file.remove().then((_) {});
           });
@@ skipping 24 matching lines @@
                 expect(fileObj.name, fileAndDir.file.name);
                 expect(fileObj.relativePath, '');
                 expect(new DateTime.now().difference(
                     fileObj.lastModifiedDate).inSeconds, lessThan(60));
               });
           });
       });
     }
   });
 }