Revert "Allow ambiguous Expect and ExpectException imports."

compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java

Index: compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java
diff --git a/compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java b/compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java
index 891afb1b086e78a3e137288a959b1fcc3788d80c..9e461a1232de21c949289ffd1d8919f2659f9081 100644
--- a/compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java
+++ b/compiler/java/com/google/dart/compiler/resolver/TopLevelElementBuilder.java
@@ -148,9 +148,7 @@ public class TopLevelElementBuilder {
         String name = element.getName();
         if (libraryImport.isVisible(name)) {
           Element oldElement = scopeForImport.declareElement(name, element);
-          // TODO(8474): Remove the "Expect" special casing.
-          if (oldElement != null
-              && !name.equals("Expect") && !name.equals("ExpectException")) {
+          if (oldElement != null) {
             scopeForImport.declareElement(name,
                 Elements.createDuplicateElement(oldElement, element));
           }