Fix flaky tests and unskip (#932)

Closes #924

Related: dart-lang/test#1203

dwds/lib/src/dwds_vm_client.dart

@@ -56,6 +56,9 @@ class DwdsVmClient {
     client.registerServiceCallback('hotRestart', (request) async {
       await _disableBreakpointsAndResume(client, chromeProxyService);
       var context = await chromeProxyService.executionContext.id;
+      // Start listening for isolate create events before issuing a hot
+      // restart. Only return success after the isolate has fully started.
+      var stream = chromeProxyService.onEvent('Isolate');
       try {
         await chromeProxyService.remoteDebugger
             .sendCommand('Runtime.evaluate', params: {
@@ -77,8 +80,6 @@ class DwdsVmClient {
           };
         }
       }
-      // Only return success after the isolate has fully started.
-      var stream = chromeProxyService.onEvent('Isolate');
       await stream.firstWhere((event) => event.kind == EventKind.kIsolateStart);
       return {'result': Success().toJson()};
     });

dwds/test/inspector_test.dart

@@ -58,7 +58,7 @@ void main() {
       var classRef = instance.classRef;
       var clazz = await inspector.getObject(isolateId, classRef.id) as Class;
       expect(clazz.name, 'MyTestClass<dynamic>');
-    }, skip: 'sdk/issues/40883');
+    });
   });
 
   group('loadField', () {

dwds/test/instance_test.dart

@@ -84,7 +84,7 @@ void main() {
           classRef.id,
           'classes|org-dartlang-app:///web/scopes_main.dart'
           '|MyTestClass<dynamic>');
-    }, skip: 'sdk/issues/40883');
+    });
 
     test('for closure', () async {
       var remoteObject = await libraryPublicFinal();

dwds/test/run_request_test.dart

@@ -2,6 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+@Timeout(Duration(minutes: 2))
+
 import 'dart:async';
 
 import 'package:dwds/src/connections/debug_connection.dart';

webdev/pubspec.yaml

@@ -1,6 +1,6 @@
 name: webdev
 # Every time this changes you need to run `pub run build_runner build`.
-version: 2.5.6
+version: 2.5.7-dev
 author: Dart Team <misc@dartlang.org>
 homepage: https://github.com/dart-lang/webdev
 description: >-
@@ -45,4 +45,8 @@ dev_dependencies:
   webdriver: ^2.0.0
 
 executables:
-  webdev:
+  webdev:
+
+dependency_overrides:
+  dwds:
+    path: ../dwds

webdev/test/daemon/app_domain_test.dart

@@ -4,6 +4,7 @@
 
 @Timeout(Duration(minutes: 2))
 import 'dart:convert';
+import 'dart:io';
 
 import 'package:test/test.dart';
 
@@ -62,6 +63,11 @@ void main() {
         var webdev =
             await runWebDev(['daemon'], workingDirectory: exampleDirectory);
         var appId = await waitForAppId(webdev);
+        if (Platform.isWindows) {
+          // Windows takes a bit longer to run the application and register
+          // the service extension.
+          await Future.delayed(const Duration(seconds: 5));
+        }
         var extensionCall = '[{"method":"app.callServiceExtension","id":0,'
             '"params" : { "appId" : "$appId", "methodName" : "ext.print"}}]';
         webdev.stdin.add(utf8.encode('$extensionCall\n'));
@@ -72,7 +78,7 @@ void main() {
                 startsWith('[{"event":"app.log","params":{"appId":"$appId",'
                     '"log":"Hello World\\n"}}')));
         await exitWebdev(webdev);
-      }, skip: 'webdev/issues/924');
+      });
 
       test('.reload', () async {
         var webdev =
@@ -108,7 +114,7 @@ void main() {
                 '[{"event":"app.progress","params":{"appId":"$appId","id":"1",'
                 '"finished":true')));
         await exitWebdev(webdev);
-      }, skip: 'webdev/issues/924');
+      });
 
       test('.stop', () async {
         var webdev =