Remove CTEC.MIXIN_OF_NON_MIXIN and MIXIN_WITH_NON_CLASS_SUPERCLASS.

editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/resolver/CompileTimeErrorCodeTest.java

Index: editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/resolver/CompileTimeErrorCodeTest.java
diff --git a/editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/resolver/CompileTimeErrorCodeTest.java b/editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/resolver/CompileTimeErrorCodeTest.java
index 24090c330ac0f38bbc478e6e6602f5117fcfd90e..0b6fb80084ccc43002b120e45c67c661a23c0228 100644
--- a/editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/resolver/CompileTimeErrorCodeTest.java
+++ b/editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/resolver/CompileTimeErrorCodeTest.java
@@ -197,26 +197,6 @@ public class CompileTimeErrorCodeTest extends ResolverTestCase {
     verify(source);
   }
 
-  public void fail_mixinOfNonMixin() throws Exception {
-    // TODO(brianwilkerson) This might be covered by more specific errors.
-    Source source = addSource(createSource(//
-    // TODO
-    ));
-    resolve(source);
-    assertErrors(CompileTimeErrorCode.MIXIN_OF_NON_MIXIN);
-    verify(source);
-  }
-
-  public void fail_mixinWithNonClassSuperclass() throws Exception {
-    // TODO(brianwilkerson) Compare with MIXIN_OF_NON_CLASS.
-    Source source = addSource(createSource(//
-        "int A;",
-        "class B extends Object mixin A {}"));
-    resolve(source);
-    assertErrors(CompileTimeErrorCode.MIXIN_WITH_NON_CLASS_SUPERCLASS);
-    verify(source);
-  }
-
   public void fail_nonConstantDefaultValue_named() throws Exception {
     Source source = addSource(createSource(//
     "f({x : 2 + 3}) {}"));
@@ -1881,6 +1861,26 @@ public class CompileTimeErrorCodeTest extends ResolverTestCase {
     verify(source);
   }
 
+  public void test_mixinWithNonClassSuperclass_class() throws Exception {
+    Source source = addSource(createSource(//
+        "int A;",
+        "class B {}",
+        "class C extends A with B {}"));
+    resolve(source);
+    assertErrors(CompileTimeErrorCode.MIXIN_WITH_NON_CLASS_SUPERCLASS);
+    verify(source);
+  }
+
+  public void test_mixinWithNonClassSuperclass_typedef() throws Exception {
+    Source source = addSource(createSource(//
+        "int A;",
+        "class B {}",
+        "typedef C = A with B {}"));
+    resolve(source);
+    assertErrors(CompileTimeErrorCode.MIXIN_WITH_NON_CLASS_SUPERCLASS);
+    verify(source);
+  }
+
   public void test_multipleSuperInitializers() throws Exception {
     Source source = addSource(createSource(//
         "class A {}",