Revert "Use scheduled_test for Pub tests."

utils/tests/pub/install/hosted/unlock_if_new_is_unsatisfied_test.dart

Index: utils/tests/pub/install/hosted/unlock_if_new_is_unsatisfied_test.dart
diff --git a/utils/tests/pub/install/hosted/unlock_if_new_is_unsatisfied_test.dart b/utils/tests/pub/install/hosted/unlock_if_new_is_unsatisfied_test.dart
index 8da00dd80ede9bf234e94e008b93a1479a27959c..91edd342f5e5018af0a3138f0c1d9f14a0c39fa9 100644
--- a/utils/tests/pub/install/hosted/unlock_if_new_is_unsatisfied_test.dart
+++ b/utils/tests/pub/install/hosted/unlock_if_new_is_unsatisfied_test.dart
@@ -6,50 +6,49 @@ library pub_tests;
 
 import 'dart:io';
 
-import '../../descriptor.dart' as d;
 import '../../test_pub.dart';
 
 main() {
   integration("unlocks dependencies if necessary to ensure that a new "
       "dependency is satisfied", () {
     servePackages([
-      packageMap("foo", "1.0.0", [dependencyMap("bar", "<2.0.0")]),
-      packageMap("bar", "1.0.0", [dependencyMap("baz", "<2.0.0")]),
-      packageMap("baz", "1.0.0", [dependencyMap("qux", "<2.0.0")]),
-      packageMap("qux", "1.0.0")
+      package("foo", "1.0.0", [dependency("bar", "<2.0.0")]),
+      package("bar", "1.0.0", [dependency("baz", "<2.0.0")]),
+      package("baz", "1.0.0", [dependency("qux", "<2.0.0")]),
+      package("qux", "1.0.0")
     ]);
 
-    d.appDir([dependencyMap("foo")]).create();
+    appDir([dependency("foo")]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: new RegExp(r"Dependencies installed!$"));
 
-    d.packagesDir({
+    packagesDir({
       "foo": "1.0.0",
       "bar": "1.0.0",
       "baz": "1.0.0",
       "qux": "1.0.0"
-    }).validate();
+    }).scheduleValidate();
 
     servePackages([
-      packageMap("foo", "2.0.0", [dependencyMap("bar", "<3.0.0")]),
-      packageMap("bar", "2.0.0", [dependencyMap("baz", "<3.0.0")]),
-      packageMap("baz", "2.0.0", [dependencyMap("qux", "<3.0.0")]),
-      packageMap("qux", "2.0.0"),
-      packageMap("newdep", "2.0.0", [dependencyMap("baz", ">=1.5.0")])
+      package("foo", "2.0.0", [dependency("bar", "<3.0.0")]),
+      package("bar", "2.0.0", [dependency("baz", "<3.0.0")]),
+      package("baz", "2.0.0", [dependency("qux", "<3.0.0")]),
+      package("qux", "2.0.0"),
+      package("newdep", "2.0.0", [dependency("baz", ">=1.5.0")])
     ]);
 
-    d.appDir([dependencyMap("foo"), dependencyMap("newdep")]).create();
+    appDir([dependency("foo"), dependency("newdep")]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: new RegExp(r"Dependencies installed!$"));
 
-    d.packagesDir({
+    packagesDir({
       "foo": "2.0.0",
       "bar": "2.0.0",
       "baz": "2.0.0",
       "qux": "1.0.0",
       "newdep": "2.0.0"
-    }).validate();
+    }).scheduleValidate();
   });
 }