Refactor Future constructors.

sdk/lib/_internal/compiler/implementation/mirrors/dart2js_mirror.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.
 
 library mirrors_dart2js;
 
 import 'dart:async';
 import 'dart:collection' show LinkedHashMap;
 import 'dart:io' show Path;
 import 'dart:uri';
@@ skipping 247 matching lines @@
     diagnosticHandler(uri, begin, end, message, kind);
   }
 
   Compiler compiler = new apiimpl.Compiler(inputProvider,
                                            null,
                                            internalDiagnosticHandler,
                                            libraryRoot, packageRoot, options);
   compiler.librariesToAnalyzeWhenRun = libraries;
   bool success = compiler.run(null);
   if (success && !compilationFailed) {
-    return new Future<MirrorSystem>.immediate(
-        new Dart2JsMirrorSystem(compiler));
+    return new Future<MirrorSystem>.value(new Dart2JsMirrorSystem(compiler));
   } else {
-    return new Future<MirrorSystem>.immediateError(
-        'Failed to create mirror system.');
+    return new Future<MirrorSystem>.error('Failed to create mirror system.');
   }
 }
 
 /**
  * Analyzes set of libraries and provides a mirror system which can be used for
  * static inspection of the source code.
  */
 // TODO(johnniwinther): Move dart:io dependent parts outside
 // dart2js_mirror.dart.
 Future<MirrorSystem> analyze(List<Path> libraries,
@@ skipping 1336 matching lines @@
                             ListConstant constant)
       : super(mirrors, constant);
 
   ListConstant get _constant => super._constant;
 
   int get length => _constant.length;
 
   Future<InstanceMirror> operator[](int index) {
     if (index < 0) throw new RangeError('Negative index');
     if (index >= _constant.length) throw new RangeError('Index out of bounds');
-    return new Future<InstanceMirror>.immediate(
+    return new Future<InstanceMirror>.value(
         _convertConstantToInstanceMirror(mirrors, _constant.entries[index]));
   }
 }
 
 class Dart2JsMapConstantMirror extends Dart2JsConstantMirror
     implements MapInstanceMirror {
   List<String> _listCache;
 
   Dart2JsMapConstantMirror(Dart2JsMirrorSystem mirrors,
                            MapConstant constant)
@@ skipping 16 matching lines @@
   int get length => _constant.length;
 
   Iterable<String> get keys {
     // TODO(johnniwinther): Return an unmodifiable list instead.
     return new List<String>.from(_list);
   }
 
   Future<InstanceMirror> operator[](String key) {
     int index = _list.indexOf(key);
     if (index == -1) return null;
-    return new Future<InstanceMirror>.immediate(
+    return new Future<InstanceMirror>.value(
         _convertConstantToInstanceMirror(mirrors, _constant.values[index]));
   }
 }
 
 class Dart2JsTypeConstantMirror extends Dart2JsConstantMirror
     implements TypeInstanceMirror {
 
   Dart2JsTypeConstantMirror(Dart2JsMirrorSystem mirrors,
                             TypeConstant constant)
       : super(mirrors, constant);
@@ skipping 25 matching lines @@
           index++;
         }, includeBackendMembers: true, includeSuperMembers: true);
       }
     }
     return _fieldMapCache;
   }
 
   Future<InstanceMirror> getField(String fieldName) {
     Constant fieldConstant = _fieldMap[fieldName];
     if (fieldConstant != null) {
-      return new Future<InstanceMirror>.immediate(
+      return new Future<InstanceMirror>.value(
           _convertConstantToInstanceMirror(mirrors, fieldConstant));
     }
     return super.getField(fieldName);
   }
 }
 
 class Dart2JsCommentInstanceMirror implements CommentInstanceMirror {
   final Dart2JsMirrorSystem mirrors;
   final String text;
   String _trimmedText;
@@ skipping 15 matching lines @@
 
   bool get hasReflectee => false;
 
   get reflectee {
     // TODO(johnniwinther): Which exception/error should be thrown here?
     throw new UnsupportedError('InstanceMirror does not have a reflectee');
   }
 
   Future<InstanceMirror> getField(String fieldName) {
     if (fieldName == 'isDocComment') {
-      return new Future.immediate(
+      return new Future.value(
           new Dart2JsBoolConstantMirror.fromBool(mirrors, isDocComment));
     } else if (fieldName == 'text') {
-      return new Future.immediate(
+      return new Future.value(
           new Dart2JsStringConstantMirror.fromString(mirrors, text));
     } else if (fieldName == 'trimmedText') {
-      return new Future.immediate(
+      return new Future.value(
           new Dart2JsStringConstantMirror.fromString(mirrors, trimmedText));
     }
     // TODO(johnniwinther): Which exception/error should be thrown here?
     throw new UnsupportedError('InstanceMirror does not have a reflectee');
   }
 }