Switch dart:html objects not to be NativeFieldWrapper subclasses with JsInterop

sdk/lib/web_sql/dartium/web_sql_dartium.dart

Index: sdk/lib/web_sql/dartium/web_sql_dartium.dart
diff --git a/sdk/lib/web_sql/dartium/web_sql_dartium.dart b/sdk/lib/web_sql/dartium/web_sql_dartium.dart
index 2d8039e31f643123a5f69278e3db9a4faf8c7404..13c01243fc6a2ca60b79163bf58eb009f6c182cb 100644
--- a/sdk/lib/web_sql/dartium/web_sql_dartium.dart
+++ b/sdk/lib/web_sql/dartium/web_sql_dartium.dart
@@ -25,11 +25,6 @@ import 'dart:js' as js;
 
 
 
-// Need a default constructor for constructing classes with mixins that are
-// also extending NativeFieldWrapperClass2.  Defining JsoNativeFieldWrapper
-// extending NativeFieldWrapperClass2 creates a default constructor.
-class JsoNativeFieldWrapper extends NativeFieldWrapperClass2 {}
-
 
 // FIXME: Can we make this private?
 final web_sqlBlinkMap = {
@@ -108,7 +103,7 @@ typedef void SqlTransactionErrorCallback(SqlError error);
 @Experimental()
 // http://www.w3.org/TR/webdatabase/#asynchronous-database-api
 @Experimental() // deprecated
-class SqlDatabase extends NativeFieldWrapperClass2 {
+class SqlDatabase extends DartHtmlDomObject {
   // To suppress missing implicit constructor warnings.
   factory SqlDatabase._() { throw new UnsupportedError("Not supported"); }
 
@@ -116,8 +111,6 @@ class SqlDatabase extends NativeFieldWrapperClass2 {
     return new SqlDatabase._internalWrap();
   }
 
-  js.JsObject blink_jsObject;
-
   factory SqlDatabase._internalWrap() {
     return new SqlDatabase.internal_();
   }
@@ -189,7 +182,7 @@ class SqlDatabase extends NativeFieldWrapperClass2 {
 @DomName('SQLError')
 // http://www.w3.org/TR/webdatabase/#sqlerror
 @Experimental() // deprecated
-class SqlError extends NativeFieldWrapperClass2 {
+class SqlError extends DartHtmlDomObject {
   // To suppress missing implicit constructor warnings.
   factory SqlError._() { throw new UnsupportedError("Not supported"); }
 
@@ -197,8 +190,6 @@ class SqlError extends NativeFieldWrapperClass2 {
     return new SqlError._internalWrap();
   }
 
-  js.JsObject blink_jsObject;
-
   factory SqlError._internalWrap() {
     return new SqlError.internal_();
   }
@@ -260,7 +251,7 @@ class SqlError extends NativeFieldWrapperClass2 {
 @DomName('SQLResultSet')
 // http://www.w3.org/TR/webdatabase/#sqlresultset
 @Experimental() // deprecated
-class SqlResultSet extends NativeFieldWrapperClass2 {
+class SqlResultSet extends DartHtmlDomObject {
   // To suppress missing implicit constructor warnings.
   factory SqlResultSet._() { throw new UnsupportedError("Not supported"); }
 
@@ -268,8 +259,6 @@ class SqlResultSet extends NativeFieldWrapperClass2 {
     return new SqlResultSet._internalWrap();
   }
 
-  js.JsObject blink_jsObject;
-
   factory SqlResultSet._internalWrap() {
     return new SqlResultSet.internal_();
   }
@@ -303,7 +292,7 @@ class SqlResultSet extends NativeFieldWrapperClass2 {
 @DomName('SQLResultSetRowList')
 // http://www.w3.org/TR/webdatabase/#sqlresultsetrowlist
 @Experimental() // deprecated
-class SqlResultSetRowList extends JsoNativeFieldWrapper with ListMixin<Map>, ImmutableListMixin<Map> implements List<Map> {
+class SqlResultSetRowList extends DartHtmlDomObject with ListMixin<Map>, ImmutableListMixin<Map> implements List<Map> {
   // To suppress missing implicit constructor warnings.
   factory SqlResultSetRowList._() { throw new UnsupportedError("Not supported"); }
 
@@ -311,8 +300,6 @@ class SqlResultSetRowList extends JsoNativeFieldWrapper with ListMixin<Map>, Imm
     return new SqlResultSetRowList._internalWrap();
   }
 
-  js.JsObject blink_jsObject;
-
   factory SqlResultSetRowList._internalWrap() {
     return new SqlResultSetRowList.internal_();
   }
@@ -391,7 +378,7 @@ class SqlResultSetRowList extends JsoNativeFieldWrapper with ListMixin<Map>, Imm
 @Experimental()
 // http://www.w3.org/TR/webdatabase/#sqltransaction
 @deprecated // deprecated
-class SqlTransaction extends NativeFieldWrapperClass2 {
+class SqlTransaction extends DartHtmlDomObject {
   // To suppress missing implicit constructor warnings.
   factory SqlTransaction._() { throw new UnsupportedError("Not supported"); }
 
@@ -399,8 +386,6 @@ class SqlTransaction extends NativeFieldWrapperClass2 {
     return new SqlTransaction._internalWrap();
   }
 
-  js.JsObject blink_jsObject;
-
   factory SqlTransaction._internalWrap() {
     return new SqlTransaction.internal_();
   }