Big merge from experimental to bleeding edge.

utils/pub/curl_client.dart

 // Copyright (c) 2012, 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.
 
 library curl_client;
 
+import 'dart:async';
 import 'dart:io';
 
 import '../../pkg/http/lib/http.dart' as http;
 import 'io.dart';
 import 'log.dart' as log;
 import 'utils.dart';
 
 /// A drop-in replacement for [http.Client] that uses the `curl` command-line
 /// utility rather than [dart:io] to make requests. This class will only exist
 /// temporarily until [dart:io] natively supports requests over HTTPS.
@@ skipping 15 matching lines @@
   /// Sends a request via `curl` and returns the response.
   Future<http.StreamedResponse> send(http.BaseRequest request) {
     log.fine("Sending Curl request $request");
 
     var requestStream = request.finalize();
     return withTempDir((tempDir) {
       var headerFile = join(tempDir, "curl-headers");
       var arguments = _argumentsForRequest(request, headerFile);
       log.process(executable, arguments);
       var process;
-      return startProcess(executable, arguments).chain((process_) {
+      return startProcess(executable, arguments).then((process_) {
         process = process_;
         if (requestStream.closed) {
           process.stdin.close();
         } else {
           requestStream.pipe(process.stdin);
         }
 
         return _waitForHeaders(process, expectBody: request.method != "HEAD");
-      }).chain((_) => new File(headerFile).readAsLines())
-        .transform((lines) => _buildResponse(request, process, lines));
+      }).then((_) => new File(headerFile).readAsLines())
+        .then((lines) => _buildResponse(request, process, lines));
     });
   }
 
   /// Returns the list of arguments to `curl` necessary for performing
   /// [request]. [headerFile] is the path to the file where the response headers
   /// should be stored.
   List<String> _argumentsForRequest(
       http.BaseRequest request, String headerFile) {
     // Note: This line of code gets munged by create_sdk.py to be the correct
     // relative path to the certificate file in the SDK.
@@ skipping 56 matching lines @@
     var completer = new Completer();
     process.onExit = (exitCode) {
       log.io("Curl process exited with code $exitCode.");
 
       if (exitCode == 0) {
         completer.complete(null);
         return;
       }
 
       chainToCompleter(consumeInputStream(process.stderr)
-            .transform((stderrBytes) {
+            .then((stderrBytes) {
         var message = new String.fromCharCodes(stderrBytes);
         log.fine('Got error reading headers from curl: $message');
         if (exitCode == 47) {
           throw new RedirectLimitExceededException([]);
         } else {
           throw new HttpException(message);
         }
       }), completer);
     };
 
@@ skipping 53 matching lines @@
   /// path to the bundled `curl.exe`; elsewhere, this is just "curl", and we
   /// assume it to be installed and on the user's PATH.
   static String get _defaultExecutable {
     if (Platform.operatingSystem != 'windows') return 'curl';
     // Note: This line of code gets munged by create_sdk.py to be the correct
     // relative path to curl in the SDK.
     var pathToCurl = "../../third_party/curl/curl.exe";
     return relativeToPub(pathToCurl);
   }
 }