Merge libv1.

compiler/java/com/google/dart/compiler/type/ExternalTypeAnalyzers.java

Index: compiler/java/com/google/dart/compiler/type/ExternalTypeAnalyzers.java
diff --git a/compiler/java/com/google/dart/compiler/type/ExternalTypeAnalyzers.java b/compiler/java/com/google/dart/compiler/type/ExternalTypeAnalyzers.java
index 56cd26774a40f0373ef1744213f6116381fb1710..c78ac00e08a7cb00090536bf349f6fff204ca77d 100644
--- a/compiler/java/com/google/dart/compiler/type/ExternalTypeAnalyzers.java
+++ b/compiler/java/com/google/dart/compiler/type/ExternalTypeAnalyzers.java
@@ -118,11 +118,8 @@ public class ExternalTypeAnalyzers {
     String name = element.getName();
     List<DartExpression> arguments = invocation.getArguments();
     LibraryElement libraryElement = Elements.getDeclaringLibrary(element);
-    // NodeSelector.query(String)
-    EnclosingElement enclosingElement = element.getEnclosingElement();
-    if ("query".equals(name) && isDeclaredInHtmlLibrary(element)
-        && ElementKind.of(enclosingElement) == ElementKind.CLASS
-        && "NodeSelector".equals(enclosingElement.getName())) {
+    // Document.query(String)
+    if ("query".equals(name) && isDeclaredInHtmlLibrary(element)) {
       return analyzeQuery(arguments, libraryElement, defaultType);
     }
     // no guess