Remove ProcessOptions and make the options named arguments.

sdk/lib/_internal/pub/test/test_pub.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.
 
 /// Test infrastructure for testing pub. Unlike typical unit tests, most pub
 /// tests are integration tests that stage some stuff on the file system, run
 /// pub, and then validate the results. This library provides an API to build
 /// tests like that.
 library test_pub;
 
@@ skipping 351 matching lines @@
   }
 
   // Find the main pub entrypoint.
   var pubPath = path.join(testDirectory, '..', 'bin', 'pub.dart');
 
   var dartArgs = ['--package-root=$_packageRoot/', '--checked', pubPath,
       '--verbose'];
   dartArgs.addAll(args);
 
   if (tokenEndpoint == null) tokenEndpoint = new Future.value();
-  var optionsFuture = tokenEndpoint.then((tokenEndpoint) {
-    var options = new ProcessOptions();
-    options.workingDirectory = pathInSandbox(appPath);
+  var environmentFuture = tokenEndpoint.then((tokenEndpoint) {
     // TODO(nweiz): remove this when issue 9294 is fixed.
-    options.environment = new Map.from(Platform.environment);
-    options.environment['_PUB_TESTING'] = 'true';
-    options.environment['PUB_CACHE'] = pathInSandbox(cachePath);
-    options.environment['DART_SDK'] = pathInSandbox(sdkPath);
+    var environment = new Map.from(Platform.environment);

[nweiz, 2013/07/22 20:15:11]

Since 9294 is fixed, this should just be initialized to a map literal.

+    environment['_PUB_TESTING'] = 'true';
+    environment['PUB_CACHE'] = pathInSandbox(cachePath);
+    environment['DART_SDK'] = pathInSandbox(sdkPath);
     if (tokenEndpoint != null) {
-      options.environment['_PUB_TEST_TOKEN_ENDPOINT'] =
+      environment['_PUB_TEST_TOKEN_ENDPOINT'] =
         tokenEndpoint.toString();
     }
-    return options;
+    return environment;
   });
 
-  return new PubProcess.start(dartBin, dartArgs, options: optionsFuture,
+  return new PubProcess.start(dartBin, dartArgs, environment: environmentFuture,
+      workingDirectory: pathInSandbox(appPath),
       description: args.isEmpty ? 'pub' : 'pub ${args.first}');
 }
 
 /// A subclass of [ScheduledProcess] that parses pub's verbose logging output
 /// and makes [nextLine], [nextErrLine], [remainingStdout], and
 /// [remainingStderr] work as though pub weren't running in verbose mode.
 class PubProcess extends ScheduledProcess {
   Stream<Pair<log.Level, String>> _log;
   Stream<String> _stdout;
   Stream<String> _stderr;
 
   PubProcess.start(executable, arguments,
-      {options, String description, Encoding encoding: Encoding.UTF_8})
+      {workingDirectory, environment, String description,
+       Encoding encoding: Encoding.UTF_8})
     : super.start(executable, arguments,
-        options: options,
+        workingDirectory: workingDirectory,
+        environment: environment,
         description: description,
         encoding: encoding);
 
   Stream<Pair<log.Level, String>> _logStream() {
     if (_log == null) {
       _log = mergeStreams(
         _outputToLog(super.stdoutStream(), log.Level.MESSAGE),
         _outputToLog(super.stderrStream(), log.Level.ERROR));
     }
 
@@ skipping 267 matching lines @@
   bool matches(item, MatchState matchState) {
     if (item is! Pair) return false;
     return _firstMatcher.matches(item.first, matchState) &&
         _lastMatcher.matches(item.last, matchState);
   }
 
   Description describe(Description description) {
     description.addAll("(", ", ", ")", [_firstMatcher, _lastMatcher]);
   }
 }