Make servePackages's contents argument saner.

sdk/lib/_internal/pub/test/upgrade/hosted/unlock_dependers_test.dart

Index: sdk/lib/_internal/pub/test/upgrade/hosted/unlock_dependers_test.dart
diff --git a/sdk/lib/_internal/pub/test/upgrade/hosted/unlock_dependers_test.dart b/sdk/lib/_internal/pub/test/upgrade/hosted/unlock_dependers_test.dart
index b217321b9b74c5c129a70d42614b40938f6ddc0d..e82146ae61ce01cb9574899f6893faa8fcb8a794 100644
--- a/sdk/lib/_internal/pub/test/upgrade/hosted/unlock_dependers_test.dart
+++ b/sdk/lib/_internal/pub/test/upgrade/hosted/unlock_dependers_test.dart
@@ -11,10 +11,10 @@ main() {
   initConfig();
   integration("upgrades a locked package's dependers in order to get it to max "
       "version", () {
-    servePackages([
-      packageMap("foo", "1.0.0", {"bar": "<2.0.0"}),
-      packageMap("bar", "1.0.0")
-    ]);
+    servePackages((builder) {
+      builder.serve("foo", "1.0.0", deps: {"bar": "<2.0.0"});
+      builder.serve("bar", "1.0.0");
+    });
 
     d.appDir({"foo": "any", "bar": "any"}).create();
 
@@ -25,10 +25,10 @@ main() {
       "bar": "1.0.0"
     }).validate();
 
-    servePackages([
-      packageMap("foo", "2.0.0", {"bar": "<3.0.0"}),
-      packageMap("bar", "2.0.0")
-    ]);
+    servePackages((builder) {
+      builder.serve("foo", "2.0.0", deps: {"bar": "<3.0.0"});
+      builder.serve("bar", "2.0.0");
+    });
 
     pubUpgrade(args: ['bar']);