Making all callbacks use zones (take 2)

tools/dom/templates/html/dart2js/html_dart2js.darttemplate

Index: tools/dom/templates/html/dart2js/html_dart2js.darttemplate
diff --git a/tools/dom/templates/html/dart2js/html_dart2js.darttemplate b/tools/dom/templates/html/dart2js/html_dart2js.darttemplate
index c2868a9504b613f349195ac2d39f5215f2a47752..9ed29025da7aa531101d6f5779119331b3267d06 100644
--- a/tools/dom/templates/html/dart2js/html_dart2js.darttemplate
+++ b/tools/dom/templates/html/dart2js/html_dart2js.darttemplate
@@ -53,7 +53,7 @@ import 'dart:_js_helper' show
     makeLeafDispatchRecord;
 import 'dart:_interceptors' show
     Interceptor, JSExtendableArray, findInterceptorConstructorForType,
-    findConstructorForWebComponentType, getNativeInterceptor, 
+    findConstructorForWebComponentType, getNativeInterceptor,
     setDispatchProperty, findInterceptorForType;
 import 'dart:_isolate_helper' show IsolateNatives;
 import 'dart:_foreign_helper' show JS;
@@ -91,6 +91,7 @@ part '$AUXILIARY_DIR/dart2js_DOMImplementation.dart';
 part '$AUXILIARY_DIR/dart2js_KeyEvent.dart';
 part '$AUXILIARY_DIR/dart2js_LocationWrapper.dart';
 part '$AUXILIARY_DIR/dart2js_Platform.dart';
+part '$AUXILIARY_DIR/shared_html.dart';
 part '$AUXILIARY_DIR/Validators.dart';
 
 
@@ -114,9 +115,6 @@ Window get window => JS('Window', 'window');
  */
 HtmlDocument get document => JS('HtmlDocument', 'document');
 
-Element query(String selector) => document.query(selector);
-ElementList queryAll(String selector) => document.queryAll(selector);
-
 // Workaround for tags like <cite> that lack their own Element subclass --
 // Dart issue 1990.
 class HtmlElement extends Element native "HTMLElement" {