"Reverting 18531"

samples/tests/samples/lib/layout/layout_test.dart

Index: samples/tests/samples/lib/layout/layout_test.dart
diff --git a/samples/tests/samples/lib/layout/layout_test.dart b/samples/tests/samples/lib/layout/layout_test.dart
index ad6ba146a4419b73081ee8bc6b2fcdd9ce121dc3..031eb139530d684128601aa182a510f97b48ed45 100644
--- a/samples/tests/samples/lib/layout/layout_test.dart
+++ b/samples/tests/samples/lib/layout/layout_test.dart
@@ -4,7 +4,6 @@
 
 library layout_tests;
 
-import 'dart:async';
 import 'dart:html';
 import '../../../../swarm/swarm_ui_lib/base/base.dart';
 import '../../../../swarm/swarm_ui_lib/layout/layout.dart';
@@ -157,10 +156,10 @@ main() {
 usingGrid(String example, void test_(View grid)) {
   final grid = createGrid(GridExamples.styles[example]);
   grid.addToDocument(document.body);
-  Timer.run(() {
+  window.setTimeout(() {
     test_(grid);
-    Timer.run(expectAsync0(() { grid.removeFromDocument(); }));
-  });
+    window.setTimeout(expectAsync0(() { grid.removeFromDocument(); }), 0);
+  }, 0);
 }
 
 verifyGrid(String example, [Map expected = null]) {