Allow ambiguous Expect and ExpectException imports.

sdk/lib/_internal/compiler/implementation/elements/modelx.dart

Index: sdk/lib/_internal/compiler/implementation/elements/modelx.dart
diff --git a/sdk/lib/_internal/compiler/implementation/elements/modelx.dart b/sdk/lib/_internal/compiler/implementation/elements/modelx.dart
index f00794640c29ca5c5686cd2b564c5f84c57f4ef0..f7412ded1d14752fe89d1115e3db87887fd49e76 100644
--- a/sdk/lib/_internal/compiler/implementation/elements/modelx.dart
+++ b/sdk/lib/_internal/compiler/implementation/elements/modelx.dart
@@ -600,6 +600,10 @@ class LibraryElementX extends ElementX implements LibraryElement {
   void addImport(Element element, DiagnosticListener listener) {
     Element existing = importScope[element.name];
     if (existing != null) {
+      if (element.name == const SourceString("Expect") ||

[Johnni Winther, 2013/02/07 12:01:41]

Add a TODO.

[floitsch, 2013/02/11 17:59:32]

Done.

+          element.name == const SourceString("ExpectException")) {
+        return;
+      }
       // TODO(johnniwinther): Provide access to the import tags from which
       // the elements came.
       importScope[element.name] = new AmbiguousElementX(