From dc5e30c946167f2cf4297d96cc13c9205d289f70 Mon Sep 17 00:00:00 2001
From: Ivan Inozemtsev <iinozemtsev@google.com>
Date: Mon, 24 Nov 2025 17:03:34 +0100
Subject: [PATCH] Remove unset `clientFuture`

Use `client` field instead. See https://github.com/dart-lang/webdev/commit/382ff428a8bc2e32830aa9d763b1887759435ed6#r171048941.
---
 dwds/CHANGELOG.md                |  1 +
 dwds/lib/src/dwds_vm_client.dart | 10 +---------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md
index 252dcfe63..6d0cb20c6 100644
--- a/dwds/CHANGELOG.md
+++ b/dwds/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## 26.2.3-wip
 
 - Bump `build_web_compilers` to ^4.4.1.
+- Remove unused `clientFuture` arg from `DwdsVmClient` methods.
 
 ## 26.2.2
 
diff --git a/dwds/lib/src/dwds_vm_client.dart b/dwds/lib/src/dwds_vm_client.dart
index a6426cbd1..dfc0cdf85 100644
--- a/dwds/lib/src/dwds_vm_client.dart
+++ b/dwds/lib/src/dwds_vm_client.dart
@@ -134,14 +134,12 @@ abstract base class DwdsVmClient<
     required Stream<VmRequest> requestStream,
     required StreamSink<VmRequest> requestSink,
     DwdsStats? dwdsStats,
-    Future<VmService>? clientFuture,
   }) {
     responseStream.listen((request) async {
       final response = await _maybeHandleServiceExtensionRequest(
         request,
         proxyService: proxyService,
         dwdsStats: dwdsStats,
-        clientFuture: clientFuture,
       );
       if (response != null) {
         requestSink.add(response);
@@ -169,13 +167,11 @@ abstract base class DwdsVmClient<
     VmResponse request, {
     required T proxyService,
     required DwdsStats? dwdsStats,
-    required Future<VmService>? clientFuture,
   }) async {
     final response = await maybeHandleServiceExtensionRequestImpl(
       request,
       proxyService: proxyService,
       dwdsStats: dwdsStats,
-      clientFuture: clientFuture,
     );
     if (response != null) {
       response['id'] = request['id'] as String;
@@ -192,7 +188,6 @@ abstract base class DwdsVmClient<
     VmResponse request, {
     required T proxyService,
     DwdsStats? dwdsStats,
-    Future<VmService>? clientFuture,
   });
 
   @mustBeOverridden
@@ -351,7 +346,6 @@ final class ChromeDwdsVmClient
     VmResponse request, {
     required ChromeProxyService proxyService,
     DwdsStats? dwdsStats,
-    Future<VmService>? clientFuture,
   }) async {
     VmRequest? response;
     final method = request['method'];
@@ -362,8 +356,7 @@ final class ChromeDwdsVmClient
     } else if (method == _NamespacedServiceExtension.extDwdsReload.method) {
       response = await _extDwdsReloadHandler(proxyService);
     } else if (method == _NamespacedServiceExtension.extDwdsRestart.method) {
-      final client = await clientFuture;
-      response = await _extDwdsRestartHandler(proxyService, client!);
+      response = await _extDwdsRestartHandler(proxyService, client);
     } else if (method == _NamespacedServiceExtension.extDwdsSendEvent.method) {
       response = await extDwdsSendEventHandler(request, dwdsStats, logger);
     } else if (method == _NamespacedServiceExtension.extDwdsScreenshot.method) {
@@ -638,7 +631,6 @@ final class WebSocketDwdsVmClient
     VmResponse request, {
     required WebSocketProxyService proxyService,
     DwdsStats? dwdsStats,
-    Future<void>? clientFuture,
   }) async {
     VmRequest? response;
     final method = request['method'];