Revert "Use scheduled_test for Pub tests."

utils/tests/pub/update/git/update_locked_test.dart

Index: utils/tests/pub/update/git/update_locked_test.dart
diff --git a/utils/tests/pub/update/git/update_locked_test.dart b/utils/tests/pub/update/git/update_locked_test.dart
index 300f53149fd7592c1bf5a68cc62fdf258db7e3f4..1fd9718c5e50ebedf806fb351436537f2eac6923 100644
--- a/utils/tests/pub/update/git/update_locked_test.dart
+++ b/utils/tests/pub/update/git/update_locked_test.dart
@@ -6,57 +6,56 @@ library pub_tests;
 
 import 'dart:io';
 
-import '../../descriptor.dart' as d;
 import '../../test_pub.dart';
 
 main() {
   integration("updates locked Git packages", () {
     ensureGit();
 
-    d.git('foo.git', [
-      d.libDir('foo'),
-      d.libPubspec('foo', '1.0.0')
-    ]).create();
+    git('foo.git', [
+      libDir('foo'),
+      libPubspec('foo', '1.0.0')
+    ]).scheduleCreate();
 
-    d.git('bar.git', [
-      d.libDir('bar'),
-      d.libPubspec('bar', '1.0.0')
-    ]).create();
+    git('bar.git', [
+      libDir('bar'),
+      libPubspec('bar', '1.0.0')
+    ]).scheduleCreate();
 
-    d.appDir([{"git": "../foo.git"}, {"git": "../bar.git"}]).create();
+    appDir([{"git": "../foo.git"}, {"git": "../bar.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";')
       ]),
-      d.dir('bar', [
-        d.file('bar.dart', 'main() => "bar";')
+      dir('bar', [
+        file('bar.dart', 'main() => "bar";')
       ])
-    ]).validate();
+    ]).scheduleValidate();
 
-    d.git('foo.git', [
-      d.libDir('foo', 'foo 2'),
-      d.libPubspec('foo', '1.0.0')
-    ]).commit();
+    git('foo.git', [
+      libDir('foo', 'foo 2'),
+      libPubspec('foo', '1.0.0')
+    ]).scheduleCommit();
 
-    d.git('bar.git', [
-      d.libDir('bar', 'bar 2'),
-      d.libPubspec('bar', '1.0.0')
-    ]).commit();
+    git('bar.git', [
+      libDir('bar', 'bar 2'),
+      libPubspec('bar', '1.0.0')
+    ]).scheduleCommit();
 
     schedulePub(args: ['update'],
         output: new RegExp(r"Dependencies updated!$"));
 
-    d.dir(packagesPath, [
-      d.dir('foo', [
-        d.file('foo.dart', 'main() => "foo 2";')
+    dir(packagesPath, [
+      dir('foo', [
+        file('foo.dart', 'main() => "foo 2";')
       ]),
-      d.dir('bar', [
-        d.file('bar.dart', 'main() => "bar 2";')
+      dir('bar', [
+        file('bar.dart', 'main() => "bar 2";')
       ])
-    ]).validate();
+    ]).scheduleValidate();
   });
 }