Make servePackages's contents argument saner.

sdk/lib/_internal/pub/test/snapshot/creates_a_snapshot_test.dart

Index: sdk/lib/_internal/pub/test/snapshot/creates_a_snapshot_test.dart
diff --git a/sdk/lib/_internal/pub/test/snapshot/creates_a_snapshot_test.dart b/sdk/lib/_internal/pub/test/snapshot/creates_a_snapshot_test.dart
index 27411dc1cc77b3005f3552a9c4a0ef905c766e8d..6683d06c1f779e45e9ef86efc3e5731bee1fa08b 100644
--- a/sdk/lib/_internal/pub/test/snapshot/creates_a_snapshot_test.dart
+++ b/sdk/lib/_internal/pub/test/snapshot/creates_a_snapshot_test.dart
@@ -14,16 +14,18 @@ main() {
   initConfig();
   integration("creates a snapshot for an immediate dependency's executables",
       () {
-    servePackages([packageMap("foo", "1.2.3")], contents: [
-      d.dir("bin", [
-        d.file("hello.dart", "void main() => print('hello!');"),
-        d.file("goodbye.dart", "void main() => print('goodbye!');"),
-        d.file("shell.sh", "echo shell"),
-        d.dir("subdir", [
-          d.file("sub.dart", "void main() => print('sub!');")
+    servePackages((builder) {
+      builder.serve("foo", "1.2.3", contents: [
+        d.dir("bin", [
+          d.file("hello.dart", "void main() => print('hello!');"),
+          d.file("goodbye.dart", "void main() => print('goodbye!');"),
+          d.file("shell.sh", "echo shell"),
+          d.dir("subdir", [
+            d.file("sub.dart", "void main() => print('sub!');")
+          ])
         ])
-      ])
-    ]);
+      ]);
+    });
 
     d.appDir({"foo": "1.2.3"}).create();