Revert 25425 and disable web_socket_ping_test on simulators for now.

tests/standalone/io/web_socket_ping_test.dart

Index: tests/standalone/io/web_socket_ping_test.dart
diff --git a/tests/standalone/io/web_socket_ping_test.dart b/tests/standalone/io/web_socket_ping_test.dart
index 248facf1fb78adda60bda01c12d4f385a71982c9..29fec923d550e218b1352ca17c626536d6d060d8 100644
--- a/tests/standalone/io/web_socket_ping_test.dart
+++ b/tests/standalone/io/web_socket_ping_test.dart
@@ -14,37 +14,24 @@ import "dart:io";
 
 void testPing(int totalConnections) {
   HttpServer.bind('localhost', 0).then((server) {
-    // The completers will be completed when the pingInterval have terminated
-    // the webSockets.
-    var completers = new List.generate(
-        totalConnections, (_) => new Completer());
-
-    int conns = 0;
     server.transform(new WebSocketTransformer()).listen((webSocket) {
-      int i = conns++;
-      webSocket.pingInterval = const Duration(milliseconds: 100);
+      webSocket.pingInterval = const Duration(milliseconds: 500);
       webSocket.drain();
-      var timer = new Timer.periodic(const Duration(milliseconds: 10), (_) {
-        webSocket.add(new List.filled(10 * 1024, 0));
-      });
-      webSocket.done.then((_) {
-        completers[i].complete();
-        timer.cancel();
-        Expect.equals(WebSocketStatus.GOING_AWAY, webSocket.closeCode);
-        webSocket.close();
-      });
     });
 
     var futures = [];
     for (int i = 0; i < totalConnections; i++) {
       futures.add(
-          WebSocket.connect('ws://localhost:${server.port}')
-              .then((webSocket) {
-                // Don't drain yet, to block data.
-                // Once the server is done, drain the peers.
-                return Future.wait(completers.map((c) => c.future))
-                    .then((_) => webSocket.drain());
-              }));
+          WebSocket.connect('ws://localhost:${server.port}').then((webSocket) {
+        webSocket.pingInterval = const Duration(milliseconds: 500);
+        webSocket.drain();
+        new Timer(const Duration(seconds: 2), () {
+          // Should not be closed yet.
+          Expect.equals(null, webSocket.closeCode);
+          webSocket.close();
+        });
+        return webSocket.done;
+      }));
     }
     Future.wait(futures).then((_) => server.close());
   });