Big merge from experimental to bleeding edge.

tests/corelib/map_test.dart

 // Copyright (c) 2011, 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 map_test;
 import 'dart:collection';
 
 class MapTest {
 
   static testMain() {
@@ skipping 134 matching lines @@
     Expect.equals(true, other_map.containsValue(value2));
     Expect.equals(2, other_map.length);
 
     other_map.clear();
     Expect.equals(0, other_map.length);
 
     // Test Collection.keys.
     void testForEachCollection(value) {
       other_map[value] = value;
     }
-    Collection keys = map.keys;
+    Iterable keys = map.keys;
     keys.forEach(testForEachCollection);
     Expect.equals(true, other_map.containsKey(key1));
     Expect.equals(true, other_map.containsKey(key2));
     Expect.equals(true, other_map.containsValue(key1));
     Expect.equals(true, other_map.containsValue(key2));
     Expect.equals(true, !other_map.containsKey(value1));
     Expect.equals(true, !other_map.containsKey(value2));
     Expect.equals(true, !other_map.containsValue(value1));
     Expect.equals(true, !other_map.containsValue(value2));
     Expect.equals(2, other_map.length);
     other_map.clear();
     Expect.equals(0, other_map.length);
 
     // Test Collection.values.
-    Collection values = map.values;
+    Iterable values = map.values;
     values.forEach(testForEachCollection);
     Expect.equals(true, !other_map.containsKey(key1));
     Expect.equals(true, !other_map.containsKey(key2));
     Expect.equals(true, !other_map.containsValue(key1));
     Expect.equals(true, !other_map.containsValue(key2));
     Expect.equals(true, other_map.containsKey(value1));
     Expect.equals(true, other_map.containsKey(value2));
     Expect.equals(true, other_map.containsValue(value1));
     Expect.equals(true, other_map.containsValue(value2));
     Expect.equals(2, other_map.length);
@@ skipping 23 matching lines @@
 
   static void testMapLiteral() {
     Map m = {"a": 1, "b" : 2, "c": 3 };
     Expect.equals(3, m.length);
     int sum = 0;
     m.forEach((a, b) {
       sum += b;
     });
     Expect.equals(6, sum);
 
-    List values = m.keys;
+    List values = m.keys.toList();
     Expect.equals(3, values.length);
     String first = values[0];
     String second = values[1];
     String third = values[2];
     String all = "${first}${second}${third}";
     Expect.equals(3, all.length);
     Expect.equals(true, all.contains("a", 0));
     Expect.equals(true, all.contains("b", 0));
     Expect.equals(true, all.contains("c", 0));
   }
@@ skipping 16 matching lines @@
     m.remove("a");
     Expect.equals(2, m.length);
     Expect.equals(null, m["a"]);
     Expect.equals(false, m.containsKey("a"));
   }
 }
 
 main() {
   MapTest.testMain();
 }