Refactor Future constructors.

utils/pub/utils.dart

Index: utils/pub/utils.dart
diff --git a/utils/pub/utils.dart b/utils/pub/utils.dart
index 6836fb437d1d16beb5aa57155490d32dbf62f0a0..5e80e5701c37b52df45d4ff7dcc0fc435da5dd27 100644
--- a/utils/pub/utils.dart
+++ b/utils/pub/utils.dart
@@ -249,7 +249,7 @@ Stream<String> streamToLines(Stream<String> stream) {
 Future<Iterable> futureWhere(Iterable iter, test(value)) {
   return Future.wait(iter.map((e) {
     var result = test(e);
-    if (result is! Future) result = new Future.immediate(result);
+    if (result is! Future) result = new Future.value(result);
     return result.then((result) => new Pair(e, result));
   }))
       .then((pairs) => pairs.where((pair) => pair.last))
@@ -343,7 +343,7 @@ Future awaitObject(object) {
   if (object is Iterable) {
     return Future.wait(object.map(awaitObject).toList());
   }
-  if (object is! Map) return new Future.immediate(object);
+  if (object is! Map) return new Future.value(object);
 
   var pairs = <Future<Pair>>[];
   object.forEach((key, value) {