- Reverting mirror changes.

tests/lib/mirrors/mixin_members_test.dart

Index: tests/lib/mirrors/mixin_members_test.dart
===================================================================
--- tests/lib/mirrors/mixin_members_test.dart	(revision 30026)
+++ tests/lib/mirrors/mixin_members_test.dart	(working copy)
@@ -31,26 +31,35 @@
 
 class C extends S with M1, M2 {}
 
+membersOf(ClassMirror cm) {
+  var result = new Map();
+  cm.declarations.forEach((k,v) {
+    if(v is MethodMirror && !v.isConstructor) result[k] = v;
+    if(v is VariableMirror) result[k] = v;
+  });
+  return result;
+}
+
 main() {
   ClassMirror cm = reflectClass(C);
   ClassMirror sM1M2 = cm.superclass;
   ClassMirror sM1 = sM1M2.superclass;
   ClassMirror s = sM1.superclass;
-  expect('{}', cm.members);
+  expect('{}', membersOf(cm));
   expect('[s(baz1), s(baz2)]',
          // TODO(ahe): Shouldn't have to sort.
-         sort(sM1M2.members.keys),
+         sort(membersOf(sM1M2).keys),
          '(S with M1, M2).members');
   expect('[s(M2)]', simpleNames(sM1M2.superinterfaces),
          '(S with M1, M2).superinterfaces');
   expect('[s(bar1), s(bar2)]',
          // TODO(ahe): Shouldn't have to sort.
-         sort(sM1.members.keys), '(S with M1).members');
+         sort(membersOf(sM1).keys), '(S with M1).members');
   expect('[s(M1)]', simpleNames(sM1.superinterfaces),
          '(S with M1).superinterfaces');
   expect('[s(foo1), s(foo2)]',
          // TODO(ahe): Shouldn't have to sort.
-         sort(s.members.keys), 's.members');
+         sort(membersOf(s).keys), 's.members');
   expect('[s(Fooer)]', simpleNames(s.superinterfaces), 's.superinterfaces');
   Expect.equals(s, reflectClass(S));
 }