Make servePackages's contents argument saner.

sdk/lib/_internal/pub/test/deps_test.dart

Index: sdk/lib/_internal/pub/test/deps_test.dart
diff --git a/sdk/lib/_internal/pub/test/deps_test.dart b/sdk/lib/_internal/pub/test/deps_test.dart
index 0241d66e5a44202c657a305dd9a3ff61da8a811e..44e7649c4a436f33f6c9a7fdcf1e1f332f6f4855 100644
--- a/sdk/lib/_internal/pub/test/deps_test.dart
+++ b/sdk/lib/_internal/pub/test/deps_test.dart
@@ -11,31 +11,33 @@ main() {
   initConfig();
 
   setUp(() {
-    servePackages([
-      packageMap("normal", "1.2.3", {
-        "transitive": "any",
-        "circular_a": "any"
-      }),
-      packageMap("transitive", "1.2.3", {
-        "shared": "any"
-      }),
-      packageMap("shared", "1.2.3", {
-        "other": "any"
-      }),
-      packageMap("unittest", "1.2.3", {
-        "shared": "any"
-      }),
-      packageMap("other", "1.0.0"),
-      packageMap("overridden", "1.0.0"),
-      packageMap("overridden", "2.0.0"),
-      packageMap("override_only", "1.2.3"),
-      packageMap("circular_a", "1.2.3", {
-        "circular_b": "any"
-      }),
-      packageMap("circular_b", "1.2.3", {
-        "circular_a": "any"
-      })
-    ]);
+    servePackages((builder) {
+      builder.serve("normal", "1.2.3", pubspec: {

[Bob Nystrom, 2014/08/21 16:44:17]

In some of the other test functions, we have a "deps" named param for this.
Allowing a full pubspec is nice for some cases, but for the common case of just
specifying regular deps, that would be terser.

[nweiz, 2014/08/21 18:28:51]

Done.

+        "dependencies": {
+          "transitive": "any",
+          "circular_a": "any"
+        }
+      });
+      builder.serve("transitive", "1.2.3", pubspec: {
+        "dependencies": {"shared": "any"}
+      });
+      builder.serve("shared", "1.2.3", pubspec: {
+        "dependencies": {"other": "any"}
+      });
+      builder.serve("unittest", "1.2.3", pubspec: {
+        "dependencies": {"shared": "any"}
+      });
+      builder.serve("other", "1.0.0");
+      builder.serve("overridden", "1.0.0");
+      builder.serve("overridden", "2.0.0");
+      builder.serve("override_only", "1.2.3");
+      builder.serve("circular_a", "1.2.3", pubspec: {
+        "dependencies": {"circular_b": "any"}
+      });
+      builder.serve("circular_b", "1.2.3", pubspec: {
+        "dependencies": {"circular_a": "any"}
+      });
+    });
 
     d.dir("from_path", [
       d.libDir("from_path"),