Commit Martin's patch for pub + lib_v2.

utils/tests/pub/curl_client_test.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_test;
 
 import 'dart:io';
 import 'dart:isolate';
-import 'dart:json';
+import 'dart:json' as json;
 import 'dart:uri';
 
 import '../../../pkg/unittest/lib/unittest.dart';
 import '../../../pkg/http/lib/http.dart' as http;
 import '../../pub/curl_client.dart';
 import '../../pub/io.dart';
 
 // TODO(rnystrom): All of the code from here to the "---..." line was copied
 // from pkg/http/test/utils.dart and pkg/http/lib/src/utils.dart. It's copied
 // here because http/test/utils.dart is now using "package:" imports and this
@@ skipping 96 matching lines @@
       });
 
       var outputEncoding;
       var encodingName = request.queryParameters['response-encoding'];
       if (encodingName != null) {
         outputEncoding = requiredEncodingForCharset(encodingName);
       } else {
         outputEncoding = Encoding.ASCII;
       }
 
-      var body = JSON.stringify(content);
+      var body = json.stringify(content);
       response.contentLength = body.length;
       response.outputStream.writeString(body, outputEncoding);
       response.outputStream.close();
     });
   };
 
   _server.listen("127.0.0.1", 0);
 }
 
 /// Stops the current HTTP server.
@@ skipping 314 matching lines @@
   test('without following redirects', () {
     var request = new http.Request('GET', serverUrl.resolve('/redirect'));
     request.followRedirects = false;
     expect(new CurlClient().send(request).then(http.Response.fromStream)
         .then((response) {
       expect(response.statusCode, equals(302));
       expect(response.isRedirect, true);
     }), completes);
   });
 }