Merging dart:html interfaces and implementations

sdk/lib/html/templates/html/dartium/html_dartium.darttemplate

Index: sdk/lib/html/templates/html/dartium/html_dartium.darttemplate
diff --git a/sdk/lib/html/templates/html/dartium/html_dartium.darttemplate b/sdk/lib/html/templates/html/dartium/html_dartium.darttemplate
index 8b0655f59a9fbec6450802b69f50f85624440166..eb166360ee6044b65eeb7a8561ce42a22d759e19 100644
--- a/sdk/lib/html/templates/html/dartium/html_dartium.darttemplate
+++ b/sdk/lib/html/templates/html/dartium/html_dartium.darttemplate
@@ -36,6 +36,7 @@ part '$AUXILIARY_DIR/_Lists.dart';
 part '$AUXILIARY_DIR/native_DOMPublic.dart';
 part '$AUXILIARY_DIR/native_DOMImplementation.dart';
 
+// FIXME (blois): Rename to _window (ditto __document).
 LocalWindow __window;
 
 LocalWindow get window {
@@ -46,22 +47,19 @@ LocalWindow get window {
   return __window;
 }
 
-LocalWindow get _window native "Utils_window";
-
 Document __document;
 
 Document get document {
   if (__document != null) {
     return __document;
   }
-  __document = _document;
+  __document = window.document;
   return __document;
 }
 
-Document get _document => _window.document;
 
-Element query(String selector) => _document.query(selector);
-List<Element> queryAll(String selector) => _document.queryAll(selector);
+Element query(String selector) => document.query(selector);
+List<Element> queryAll(String selector) => document.queryAll(selector);
 
 int _getNewIsolateId() => _Utils._getNewIsolateId();