Big merge from experimental to bleeding edge.

tests/language/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.
 // A subtest of the larger MapTest. Will eliminate once the full
 // test is running.
 
 class MapTest {
 
   static void testDeletedElement(Map map) {
     map.clear();
@@ skipping 140 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);
      other_map.clear();
      Expect.equals(0, other_map.length);
 
      // Test Map.putIfAbsent.
      map.clear();
      Expect.equals(false, map.containsKey(key1));
      map.putIfAbsent(key1, () => 10);
      Expect.equals(true, map.containsKey(key1));
      Expect.equals(10, map[key1]);
      Expect.equals(10,
          map.putIfAbsent(key1, () => 11));
    }
 
   static testKeys(Map map) {
     map[1] = 101;
     map[2] = 102;
-    Collection k = map.keys;
+    Iterable k = map.keys;
     Expect.equals(2, k.length);
-    Collection v = map.values;
+    Iterable v = map.values;
     Expect.equals(2, v.length);
     Expect.equals(true, map.containsValue(101));
     Expect.equals(true, map.containsValue(102));
     Expect.equals(false, map.containsValue(103));
   }
 
   static testMain() {
     test(new Map());
     testKeys(new Map());
   }
 }
 
 
 main() {
   MapTest.testMain();
 }