Revert "Use scheduled_test for Pub tests."

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

Index: utils/tests/pub/install/hosted/unlock_if_incompatible_test.dart
diff --git a/utils/tests/pub/install/hosted/unlock_if_incompatible_test.dart b/utils/tests/pub/install/hosted/unlock_if_incompatible_test.dart
index f1dd592bf0ef701eafd3c461541ccaa7a0287638..13a69203dac9d405da80ffaf6c496efd1e5d8182 100644
--- a/utils/tests/pub/install/hosted/unlock_if_incompatible_test.dart
+++ b/utils/tests/pub/install/hosted/unlock_if_incompatible_test.dart
@@ -6,28 +6,27 @@ library pub_tests;
 
 import 'dart:io';
 
-import '../../descriptor.dart' as d;
 import '../../test_pub.dart';
 
 main() {
   integration('updates a locked pub server package with a new incompatible '
       'constraint', () {
-    servePackages([packageMap("foo", "1.0.0")]);
+    servePackages([package("foo", "1.0.0")]);
 
-    d.appDir([dependencyMap("foo")]).create();
+    appDir([dependency("foo")]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: new RegExp(r"Dependencies installed!$"));
 
-    d.packagesDir({"foo": "1.0.0"}).validate();
+    packagesDir({"foo": "1.0.0"}).scheduleValidate();
 
-    servePackages([packageMap("foo", "1.0.1")]);
+    servePackages([package("foo", "1.0.1")]);
 
-    d.appDir([dependencyMap("foo", ">1.0.0")]).create();
+    appDir([dependency("foo", ">1.0.0")]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: new RegExp(r"Dependencies installed!$"));
 
-    d.packagesDir({"foo": "1.0.1"}).validate();
+    packagesDir({"foo": "1.0.1"}).scheduleValidate();
   });
 }