Get rid of hokey dependencyMapList stuff.

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

 // Copyright (c) 2013, 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.
 
 /// Pub-specific scheduled_test descriptors.
 library descriptor;
 
 import 'package:oauth2/oauth2.dart' as oauth2;
 import 'package:scheduled_test/scheduled_server.dart';
 import 'package:scheduled_test/scheduled_test.dart';
@@ skipping 30 matching lines @@
 ///
 /// [contents] may contain [Future]s that resolve to serializable objects,
 /// which may in turn contain [Future]s recursively.
 Descriptor pubspec(Map contents) {
   return async(awaitObject(contents).then((resolvedContents) =>
       file("pubspec.yaml", yaml(resolvedContents))));
 }
 
 /// Describes a file named `pubspec.yaml` for an application package with the
 /// given [dependencies].
-Descriptor appPubspec(List dependencies) {
-  return pubspec({
-    "name": "myapp",
-    "dependencies": dependencyListToMap(dependencies)
-  });
+Descriptor appPubspec([Map dependencies]) {
+  var map = {"name": "myapp"};
+  if (dependencies != null) map["dependencies"] = dependencies;
+  return pubspec(map);
 }
 
 /// Describes a file named `pubspec.yaml` for a library package with the given
 /// [name], [version], and [deps]. If "sdk" is given, then it adds an SDK
 /// constraint on that version.
-Descriptor libPubspec(String name, String version, {List deps, String sdk}) {
+Descriptor libPubspec(String name, String version, {Map deps, String sdk}) {
   var map = packageMap(name, version, deps);
-
-  if (sdk != null) {
-    map["environment"] = {
-      "sdk": sdk
-    };
-  }
-
+  if (sdk != null) map["environment"] = {"sdk": sdk};
   return pubspec(map);
 }
 
 /// Describes a directory named `lib` containing a single dart file named
 /// `<name>.dart` that contains a line of Dart code.
 Descriptor libDir(String name, [String code]) {
   // Default to printing the name if no other code was given.
-  if (code == null) {
-    code = name;
-  }
-
+  if (code == null) code = name;
   return dir("lib", [
     file("$name.dart", 'main() => "$code";')
   ]);
 }
 
 /// Describes a directory for a Git package. This directory is of the form
 /// found in the revision cache of the global package cache.
 Descriptor gitPackageRevisionCacheDir(String name, [int modifier]) {
   var value = name;
   if (modifier != null) value = "$name $modifier";
@@ skipping 79 matching lines @@
           refreshToken,
           url.resolve('/token'),
           ['https://www.googleapis.com/auth/userinfo.email'],
           expiration).toJson())
     ]);
   }));
 }
 
 /// Describes the application directory, containing only a pubspec specifying
 /// the given [dependencies].
-DirectoryDescriptor appDir(List dependencies) =>
+DirectoryDescriptor appDir([Map dependencies]) =>
   dir(appPath, [appPubspec(dependencies)]);