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

runtime/lib/byte_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.
 
 patch class Int8List {
   /* patch */ factory Int8List(int length) {
     return new _Int8Array(length);
   }
 
   /* patch */ factory Int8List.transferable(int length) {
@@ skipping 169 matching lines @@
 
 abstract class _ByteArrayBase {
   int lengthInBytes();
 
   int bytesPerElement();
 
   operator[](int index);
 
   // Methods implementing the Collection interface.
 
-  bool contains(element) => IterableMixinWorkaround.contains(this, element);
+  bool contains(element) => Collections.contains(this, element);
 
   void forEach(void f(element)) {
     var len = this.length;
     for (var i = 0; i < len; i++) {
       f(this[i]);
     }
   }
 
   List mappedBy(f(int element)) {
-    return IterableMixinWorkaround.mappedByList(this, f);
+    return new MappedList<int, dynamic>(this, f);
   }
 
   String join([String separator]) {
-    return IterableMixinWorkaround.join(this, separator);
+    return Collections.join(this, separator);
   }
 
   dynamic reduce(dynamic initialValue,
                  dynamic combine(dynamic initialValue, element)) {
-    return IterableMixinWorkaround.reduce(this, initialValue, combine);
+    return Collections.reduce(this, initialValue, combine);
   }
 
   Collection where(bool f(element)) {
-    return IterableMixinWorkaround.where(this, f);
+    return new WhereIterable<int>(this, f);
   }
 
   List<int> take(int n) {
-    return IterableMixinWorkaround.takeList(this, n);
+    return new ListView<int>(this, 0, n);
   }
 
   Iterable<int> takeWhile(bool test(int value)) {
-    return IterableMixinWorkaround.takeWhile(this, test);
+    return new TakeWhileIterable<int>(this, test);
   }
 
   List<int> skip(int n) {
-    return IterableMixinWorkaround.skipList(this, n);
+    return new ListView<int>(this, n, null);
   }
 
   Iterable<int> skipWhile(bool test(int value)) {
-    return IterableMixinWorkaround.skipWhile(this, test);
+    return new SkipWhileIterable<int>(this, test);
   }
 
   bool every(bool f(element)) {
-    return IterableMixinWorkaround.every(this, f);
+    return Collections.every(this, f);
   }
 
   bool any(bool f(element)) {
-    return IterableMixinWorkaround.any(this, f);
+    return Collections.any(this, f);
   }
 
   int firstMatching(bool test(int value), {int orElse()}) {
-    return IterableMixinWorkaround.firstMatching(this, test, orElse);
+    return Collections.firstMatching(this, test, orElse);
   }
 
   int lastMatching(bool test(int value), {int orElse()}) {
-    return IterableMixinWorkaround.lastMatchingInList(this, test, orElse);
+    return Collections.lastMatchingInList(this, test, orElse);
   }
 
   int singleMatching(bool test(int value)) {
-    return IterableMixinWorkaround.singleMatching(this, test);
+    return Collections.singleMatching(this, test);
   }
 
   int elementAt(int index) {
     return this[index];
   }
 
   bool get isEmpty {
     return this.length == 0;
   }
 
@@ skipping 56 matching lines @@
     if (length > 0) return this[length - 1];
     throw new StateError("No elements");
   }
 
   int get single {
     if (length == 1) return this[0];
     if (length == 0) throw new StateError("No elements");
     throw new StateError("More than one element");
   }
 
-  int min([int compare(int a, int b)]) => IterableMixinWorkaround.min(this, compare);
+  int min([int compare(int a, int b)]) => Collections.min(this, compare);
 
-  int max([int compare(int a, int b)]) => IterableMixinWorkaround.max(this, compare);
+  int max([int compare(int a, int b)]) => Collections.max(this, compare);
 
   void removeRange(int start, int length) {
     throw new UnsupportedError(
         "Cannot remove from a non-extendable array");
   }
 
   void insertRange(int start, int length, [initialValue]) {
     throw new UnsupportedError(
         "Cannot add to a non-extendable array");
   }
@@ skipping 2310 matching lines @@
   ByteArray asByteArray([int start = 0, int length]) {
     if (length == null) {
       length = this.lengthInBytes();
     }
     _rangeCheck(this.length, start, length);
     return _array.subByteArray(_offset + start, length);
   }
 
   static const int _BYTES_PER_ELEMENT = 8;
 }