Remove checks for Expect and ExpectException from

runtime/vm/parser.cc

 // 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.
 
 #include "vm/parser.h"
 
 #include "lib/invocation_mirror.h"
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
@@ skipping 8335 matching lines @@
     String& first_lib_url = String::Handle();
     Namespace& import = Namespace::Handle();
     intptr_t num_imports = library_.num_imports();
     Object& imported_obj = Object::Handle();
     Library& lib = Library::Handle();
     for (int i = 0; i < num_imports; i++) {
       import = library_.ImportAt(i);
       imported_obj = LookupNameInImport(import, name);
       if (!imported_obj.IsNull()) {
         lib ^= import.library();
-        // TODO(8474): Remove the "Expect" special casing.
-        if (!first_lib_url.IsNull()
-            && (strcmp(name.ToCString(), "Expect") != 0)
-            && (strcmp(name.ToCString(), "ExpectException") != 0)) {
+        if (!first_lib_url.IsNull()) {
           // Found duplicate definition.
           Error& ambiguous_ref_error = Error::Handle();
           if (first_lib_url.raw() == lib.url()) {
             ambiguous_ref_error = FormatErrorMsg(
                 script_, ident_pos, "Error",
                 "ambiguous reference: "
                 "'%s' as library '%s' is imported multiple times",
                 name.ToCString(),
                 first_lib_url.ToCString());
           } else {
@@ skipping 1586 matching lines @@
 void Parser::SkipQualIdent() {
   ASSERT(IsIdentifier());
   ConsumeToken();
   if (CurrentToken() == Token::kPERIOD) {
     ConsumeToken();  // Consume the kPERIOD token.
     ExpectIdentifier("identifier expected after '.'");
   }
 }
 
 }  // namespace dart