Revert "Use scheduled_test for Pub tests."

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

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library pub_tests;
 
 import 'dart:io';
 
-import '../../descriptor.dart' as d;
 import '../../test_pub.dart';
 
 main() {
   integration('updates a locked Git package with a new incompatible '
       '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();
   });
 }