Allow ambiguous Expect and ExpectException imports.

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

 // 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.
 
 package com.google.dart.compiler.resolver;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ skipping 130 matching lines @@
           scopeForImport = importScope;
         }
       }
       // Prepare "lib" scope.
       fillInLibraryScope(lib, listener, processedObjects);
       // Fill "library" scope with element exported from "lib".
       for (Element element : lib.getElement().getExportedElements()) {
         String name = element.getName();
         if (libraryImport.isVisible(name)) {
           Element oldElement = scopeForImport.declareElement(name, element);
-          if (oldElement != null) {
+          // TODO(8474): Remove the "Expect" special casing.
+          if (oldElement != null
+              && !name.equals("Expect") && !name.equals("ExpectException")) {
             scopeForImport.declareElement(name,
                 Elements.createDuplicateElement(oldElement, element));
           }
         }
       }
     }
 
     // Fill "library" export scope with re-exports.
     for (LibraryExport export : library.getExports()) {
       if (!processedObjects.add(export)) {
@@ skipping 152 matching lines @@
     }
 
     @Override
     public Void visitField(DartField node) {
       Modifiers modifiers = node.getModifiers();
       node.setElement(Elements.fieldFromNode(node, library, node.getObsoleteMetadata(), modifiers));
       return null;
     }
   }
 }