Big merge from experimental to bleeding edge.

pkg/intl/lib/src/lazy_locale_data.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.
 
 /**
  * This defines a class for loading locale data incrementally from
  * an external source as JSON. The external sources expected are either
  * local files or via HTTP request.
  */
 
 library lazy_locale_data;
+import 'dart:async';
 import 'dart:uri';
 import 'intl_helpers.dart';
-import 'dart:json';
+import 'dart:json' as json;
 
 /**
  * This implements the very basic map-type operations which are used
  * in locale lookup, and looks them up based on a URL that defines
  * the external source.
  */
 class LazyLocaleData {
   /// This holds the data we have loaded.
   Map map;
 
@@ skipping 67 matching lines @@
    */
   unsupportedLocale(localeName) { throw new LocaleDataException(
       'Locale $localeName has no data available');}
 
   /**
    * Initialize for locale. Internal use only. As a user, call
    * initializeDateFormatting instead.
    */
   Future initLocale(String localeName) {
     var data = _reader.read(localeName);
-    return jsonData(data).transform( (input) {
+    return jsonData(data).then( (input) {
         map[localeName] = _creationFunction(input);});
   }
 
   /**
    * Given a Future [input] whose value is expected to be a string in JSON form,
    * return another future that parses the JSON into a usable format.
    */
   Future jsonData(Future input) {
-    return input.transform( (response) => JSON.parse(response));
+    return input.then( (response) => json.parse(response));
   }
-}
+}