Make servePackages's contents argument saner.

sdk/lib/_internal/pub/test/downgrade/unlock_if_necessary_test.dart

Index: sdk/lib/_internal/pub/test/downgrade/unlock_if_necessary_test.dart
diff --git a/sdk/lib/_internal/pub/test/downgrade/unlock_if_necessary_test.dart b/sdk/lib/_internal/pub/test/downgrade/unlock_if_necessary_test.dart
index 48c7bd86fe8176cbf83ff20ee7aa29fe029eada5..a15617f61fa47a809e6bc25cde18e3005fecb2fa 100644
--- a/sdk/lib/_internal/pub/test/downgrade/unlock_if_necessary_test.dart
+++ b/sdk/lib/_internal/pub/test/downgrade/unlock_if_necessary_test.dart
@@ -11,10 +11,12 @@ main() {
   initConfig();
   integration("downgrades one locked hosted package's dependencies if it's "
       "necessary", () {
-    servePackages([
-      packageMap("foo", "2.0.0", {"foo_dep": "any"}),
-      packageMap("foo_dep", "2.0.0")
-    ]);
+    servePackages((builder) {
+      builder.serve("foo", "2.0.0", pubspec: {
+        "dependencies": {"foo_dep": "any"}
+      });
+      builder.serve("foo_dep", "2.0.0");
+    });
 
     d.appDir({"foo": "any"}).create();
 
@@ -25,10 +27,12 @@ main() {
       "foo_dep": "2.0.0"
     }).validate();
 
-    servePackages([
-      packageMap("foo", "1.0.0", {"foo_dep": "<2.0.0"}),
-      packageMap("foo_dep", "1.0.0")
-    ]);
+    servePackages((builder) {
+      builder.serve("foo", "1.0.0", pubspec: {
+        "dependencies": {"foo_dep": "<2.0.0"}
+      });
+      builder.serve("foo_dep", "1.0.0");
+    });
 
     pubDowngrade(args: ['foo']);