Revert "Use scheduled_test for Pub tests."

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

Index: utils/tests/pub/install/git/unlock_if_incompatible_test.dart
diff --git a/utils/tests/pub/install/git/unlock_if_incompatible_test.dart b/utils/tests/pub/install/git/unlock_if_incompatible_test.dart
index 64d44068ccc9893bf87bd90efe014d138565721c..47aa1386b0449322f4ec95aa6c953ade7b54234d 100644
--- a/utils/tests/pub/install/git/unlock_if_incompatible_test.dart
+++ b/utils/tests/pub/install/git/unlock_if_incompatible_test.dart
@@ -6,7 +6,6 @@ library pub_tests;
 
 import 'dart:io';
 
-import '../../descriptor.dart' as d;
 import '../../test_pub.dart';
 
 main() {
@@ -14,36 +13,36 @@ main() {
       'constraint', () {
     ensureGit();
 
-    d.git('foo.git', [
-      d.libDir('foo'),
-      d.libPubspec('foo', '0.5.0')
-    ]).create();
+    git('foo.git', [
+      libDir('foo'),
+      libPubspec('foo', '0.5.0')
+    ]).scheduleCreate();
 
-    d.appDir([{"git": "../foo.git"}]).create();
+    appDir([{"git": "../foo.git"}]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: new RegExp(r"Dependencies installed!$"));
 
-    d.dir(packagesPath, [
-      d.dir('foo', [
-        d.file('foo.dart', 'main() => "foo";')
+    dir(packagesPath, [
+      dir('foo', [
+        file('foo.dart', 'main() => "foo";')
       ])
-    ]).validate();
+    ]).scheduleValidate();
 
-    d.git('foo.git', [
-      d.libDir('foo', 'foo 1.0.0'),
-      d.libPubspec("foo", "1.0.0")
-    ]).commit();
+    git('foo.git', [
+      libDir('foo', 'foo 1.0.0'),
+      libPubspec("foo", "1.0.0")
+    ]).scheduleCommit();
 
-    d.appDir([{"git": "../foo.git", "version": ">=1.0.0"}]).create();
+    appDir([{"git": "../foo.git", "version": ">=1.0.0"}]).scheduleCreate();
 
     schedulePub(args: ['install'],
         output: new RegExp(r"Dependencies installed!$"));
 
-    d.dir(packagesPath, [
-      d.dir('foo', [
-        d.file('foo.dart', 'main() => "foo 1.0.0";')
+    dir(packagesPath, [
+      dir('foo', [
+        file('foo.dart', 'main() => "foo 1.0.0";')
       ])
-    ]).validate();
+    ]).scheduleValidate();
   });
 }