Big merge from experimental to bleeding edge.

tests/html/websql_test.dart

Index: tests/html/websql_test.dart
diff --git a/tests/html/websql_test.dart b/tests/html/websql_test.dart
index 5bbf6e574998619727f7cd86fb2c7013b1ef24da..a4416ce87c61f472c81be7b8da507ec33e8c558c 100644
--- a/tests/html/websql_test.dart
+++ b/tests/html/websql_test.dart
@@ -99,10 +99,10 @@ main() {
     createTransaction(db)
       // Attempt to clear out any tables which may be lurking from previous
       // runs.
-      .chain(dropTable(tableName, true))
-      .chain(createTable(tableName, columnName))
-      .chain(insert(tableName, columnName, 'Some text data'))
-      .chain(queryTable(tableName, (resultSet) {
+      .then(dropTable(tableName, true))
+      .then(createTable(tableName, columnName))
+      .then(insert(tableName, columnName, 'Some text data'))
+      .then(queryTable(tableName, (resultSet) {
         guardAsync(() {
           expect(resultSet.rows.length, 1);
           var row = resultSet.rows.item(0);
@@ -110,7 +110,7 @@ main() {
           expect(row[columnName], 'Some text data');
         });
       }))
-      .chain(dropTable(tableName))
+      .then(dropTable(tableName))
       .then(expectAsync1((tx) {}));
   });
 }