Revert "Create IterableMixinWorkaround and move most of the Collections methods there."

runtime/lib/growable_array.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.
 
 class _GrowableObjectArray<T> implements List<T> {
   factory _GrowableObjectArray._uninstantiable() {
     throw new UnsupportedError(
         "GrowableObjectArray can only be allocated by the VM");
   }
 
@@ skipping 145 matching lines @@
     if (length > 0) return this[length - 1];
     throw new StateError("No elements");
   }
 
   T get single {
     if (length == 1) return this[0];
     if (length == 0) throw new StateError("No elements");
     throw new StateError("More than one element");
   }
 
-  T min([int compare(T a, T b)]) => IterableMixinWorkaround.min(this, compare);
+  T min([int compare(T a, T b)]) => Collections.min(this, compare);
 
-  T max([int compare(T a, T b)]) => IterableMixinWorkaround.max(this, compare);
+  T max([int compare(T a, T b)]) => Collections.max(this, compare);
 
   int indexOf(T element, [int start = 0]) {
     return Arrays.indexOf(this, element, start, length);
   }
 
   int lastIndexOf(T element, [int start = null]) {
     if (start == null) start = length - 1;
     return Arrays.lastIndexOf(this, element, start);
   }
 
   void _grow(int new_length) {
     var new_data = new _ObjectArray<T>(new_length);
     for (int i = 0; i < length; i++) {
       new_data[i] = this[i];
     }
     _setData(new_data);
   }
 
   // Collection interface.
 
   bool contains(T element) {
-    return IterableMixinWorkaround.contains(this, element);
+    return Collections.contains(this, element);
   }
 
   void forEach(f(T element)) {
-    // TODO(srdjan): Use IterableMixinWorkaround.forEach(this, f);
+    // TODO(srdjan): Use Collections.forEach(this, f);
     // Accessing the list directly improves DeltaBlue performance by 25%.
     for (int i = 0; i < length; i++) {
       f(this[i]);
     }
   }
 
   String join([String separator]) {
     if (isEmpty) return "";
     if (this.length == 1) return "${this[0]}";
     StringBuffer buffer = new StringBuffer();
     if (separator == null || separator == "") {
       for (int i = 0; i < this.length; i++) {
         buffer.add("${this[i]}");
       }
     } else {
       buffer.add("${this[0]}");
       for (int i = 1; i < this.length; i++) {
         buffer.add(separator);
         buffer.add("${this[i]}");
       }
     }
     return buffer.toString();
   }
 
   List mappedBy(f(T element)) {
-    return IterableMixinWorkaround.mappedByList(this, f);
+    return new MappedList<T, dynamic>(this, f);
   }
 
   reduce(initialValue, combine(previousValue, T element)) {
-    return IterableMixinWorkaround.reduce(this, initialValue, combine);
+    return Collections.reduce(this, initialValue, combine);
   }
 
   Iterable<T> where(bool f(T element)) {
-    return IterableMixinWorkaround.where(this, f);
+    return new WhereIterable<T>(this, f);
   }
 
   List<T> take(int n) {
-    return IterableMixinWorkaround.takeList(this, n);
+    return new ListView<T>(this, 0, n);
   }
 
   Iterable<T> takeWhile(bool test(T value)) {
-    return IterableMixinWorkaround.takeWhile(this, test);
+    return new TakeWhileIterable<T>(this, test);
   }
 
   List<T> skip(int n) {
-    return IterableMixinWorkaround.skipList(this, n);
+    return new ListView<T>(this, n, null);
   }
 
   Iterable<T> skipWhile(bool test(T value)) {
-    return IterableMixinWorkaround.skipWhile(this, test);
+    return new SkipWhileIterable<T>(this, test);
   }
 
   bool every(bool f(T element)) {
-    return IterableMixinWorkaround.every(this, f);
+    return Collections.every(this, f);
   }
 
   bool any(bool f(T element)) {
-    return IterableMixinWorkaround.any(this, f);
+    return Collections.any(this, f);
   }
 
   T firstMatching(bool test(T value), {T orElse()}) {
-    return IterableMixinWorkaround.firstMatching(this, test, orElse);
+    return Collections.firstMatching(this, test, orElse);
   }
 
   T lastMatching(bool test(T value), {T orElse()}) {
-    return IterableMixinWorkaround.lastMatchingInList(this, test, orElse);
+    return Collections.lastMatchingInList(this, test, orElse);
   }
 
   T singleMatching(bool test(T value)) {
-    return IterableMixinWorkaround.singleMatching(this, test);
+    return Collections.singleMatching(this, test);
   }
 
   T elementAt(int index) {
     return this[index];
   }
 
   bool get isEmpty {
     return this.length == 0;
   }
 
@@ skipping 15 matching lines @@
   }
 
   List<T> toList() {
     return new List<T>.from(this);
   }
 
   Set<T> toSet() {
     return new Set<T>.from(this);
   }
 }