diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version
index 2028b7486f3..9cf62c6becb 100644
--- a/.ci/flutter_master.version
+++ b/.ci/flutter_master.version
@@ -1 +1 @@
-f2f80059ff87be34f773de33400af52a00c81a1a
+5a279edc239f4efd91223ddc609c2b5129325feb
diff --git a/packages/google_maps_flutter/google_maps_flutter/example/lib/scrolling_map.dart b/packages/google_maps_flutter/google_maps_flutter/example/lib/scrolling_map.dart
index c4b5642d182..9ec6a02f425 100644
--- a/packages/google_maps_flutter/google_maps_flutter/example/lib/scrolling_map.dart
+++ b/packages/google_maps_flutter/google_maps_flutter/example/lib/scrolling_map.dart
@@ -94,8 +94,8 @@ class ScrollingMapBody extends StatelessWidget {
                           ),
                         ),
                       },
-                      gestureRecognizers: <
-                          Factory<OneSequenceGestureRecognizer>>{
+                      gestureRecognizers: <Factory<
+                          OneSequenceGestureRecognizer>>{
                         Factory<OneSequenceGestureRecognizer>(
                           () => ScaleGestureRecognizer(),
                         ),
diff --git a/packages/google_maps_flutter/google_maps_flutter_android/example/lib/scrolling_map.dart b/packages/google_maps_flutter/google_maps_flutter_android/example/lib/scrolling_map.dart
index 53619992acd..a4901f2ce5f 100644
--- a/packages/google_maps_flutter/google_maps_flutter_android/example/lib/scrolling_map.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_android/example/lib/scrolling_map.dart
@@ -95,8 +95,8 @@ class ScrollingMapBody extends StatelessWidget {
                           ),
                         ),
                       },
-                      gestureRecognizers: <
-                          Factory<OneSequenceGestureRecognizer>>{
+                      gestureRecognizers: <Factory<
+                          OneSequenceGestureRecognizer>>{
                         Factory<OneSequenceGestureRecognizer>(
                           () => ScaleGestureRecognizer(),
                         ),
diff --git a/packages/google_maps_flutter/google_maps_flutter_ios/example/lib/scrolling_map.dart b/packages/google_maps_flutter/google_maps_flutter_ios/example/lib/scrolling_map.dart
index 53619992acd..a4901f2ce5f 100644
--- a/packages/google_maps_flutter/google_maps_flutter_ios/example/lib/scrolling_map.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_ios/example/lib/scrolling_map.dart
@@ -95,8 +95,8 @@ class ScrollingMapBody extends StatelessWidget {
                           ),
                         ),
                       },
-                      gestureRecognizers: <
-                          Factory<OneSequenceGestureRecognizer>>{
+                      gestureRecognizers: <Factory<
+                          OneSequenceGestureRecognizer>>{
                         Factory<OneSequenceGestureRecognizer>(
                           () => ScaleGestureRecognizer(),
                         ),
diff --git a/packages/url_launcher/url_launcher_web/lib/src/link.dart b/packages/url_launcher/url_launcher_web/lib/src/link.dart
index 927cc7d625b..df1fd140a2d 100644
--- a/packages/url_launcher/url_launcher_web/lib/src/link.dart
+++ b/packages/url_launcher/url_launcher_web/lib/src/link.dart
@@ -85,8 +85,8 @@ class WebLinkDelegateState extends State<WebLinkDelegate> {
                 (BuildContext context, PlatformViewController controller) {
               return PlatformViewSurface(
                 controller: controller,
-                gestureRecognizers: const <
-                    Factory<OneSequenceGestureRecognizer>>{},
+                gestureRecognizers: const <Factory<
+                    OneSequenceGestureRecognizer>>{},
                 hitTestBehavior: PlatformViewHitTestBehavior.transparent,
               );
             },
diff --git a/packages/webview_flutter/webview_flutter_android/lib/src/android_proxy.dart b/packages/webview_flutter/webview_flutter_android/lib/src/android_proxy.dart
index 9437e9dd3eb..2a480c44176 100644
--- a/packages/webview_flutter/webview_flutter_android/lib/src/android_proxy.dart
+++ b/packages/webview_flutter/webview_flutter_android/lib/src/android_proxy.dart
@@ -40,8 +40,7 @@ class AndroidWebViewProxy {
     Future<List<String>> Function(
       android_webview.WebView webView,
       android_webview.FileChooserParams params,
-    )?
-        onShowFileChooser,
+    )? onShowFileChooser,
   }) createAndroidWebChromeClient;
 
   /// Constructs a [android_webview.WebViewClient].
@@ -52,21 +51,18 @@ class AndroidWebViewProxy {
       android_webview.WebView webView,
       android_webview.WebResourceRequest request,
       android_webview.WebResourceError error,
-    )?
-        onReceivedRequestError,
+    )? onReceivedRequestError,
     @Deprecated('Only called on Android version < 23.')
         void Function(
       android_webview.WebView webView,
       int errorCode,
       String description,
       String failingUrl,
-    )?
-            onReceivedError,
+    )? onReceivedError,
     void Function(
       android_webview.WebView webView,
       android_webview.WebResourceRequest request,
-    )?
-        requestLoading,
+    )? requestLoading,
     void Function(android_webview.WebView webView, String url)? urlLoading,
   }) createAndroidWebViewClient;
 
@@ -88,8 +84,7 @@ class AndroidWebViewProxy {
       String contentDisposition,
       String mimetype,
       int contentLength,
-    )
-        onDownloadStart,
+    ) onDownloadStart,
   }) createDownloadListener;
 
   /// Enables debugging of web contents (HTML / CSS / JavaScript) loaded into any WebViews of this application.
diff --git a/packages/webview_flutter/webview_flutter_android/lib/src/android_webview_controller.dart b/packages/webview_flutter/webview_flutter_android/lib/src/android_webview_controller.dart
index 3a7d0777e21..9c9093b6ec0 100644
--- a/packages/webview_flutter/webview_flutter_android/lib/src/android_webview_controller.dart
+++ b/packages/webview_flutter/webview_flutter_android/lib/src/android_webview_controller.dart
@@ -44,7 +44,8 @@ class AndroidWebViewControllerCreationParams
     PlatformWebViewControllerCreationParams params, {
     @visibleForTesting
         AndroidWebViewProxy androidWebViewProxy = const AndroidWebViewProxy(),
-    @visibleForTesting android_webview.WebStorage? androidWebStorage,
+    @visibleForTesting
+        android_webview.WebStorage? androidWebStorage,
   }) {
     return AndroidWebViewControllerCreationParams(
       androidWebViewProxy: androidWebViewProxy,
@@ -495,7 +496,8 @@ class AndroidWebViewWidgetCreationParams
     super.layoutDirection,
     super.gestureRecognizers,
     this.displayWithHybridComposition = false,
-    @visibleForTesting InstanceManager? instanceManager,
+    @visibleForTesting
+        InstanceManager? instanceManager,
     @visibleForTesting
         this.platformViewsServiceProxy = const PlatformViewsServiceProxy(),
   }) : instanceManager =
diff --git a/packages/webview_flutter/webview_flutter_android/lib/src/legacy/webview_android_widget.dart b/packages/webview_flutter/webview_flutter_android/lib/src/legacy/webview_android_widget.dart
index cd4ba820cf4..ec1c3cd6204 100644
--- a/packages/webview_flutter/webview_flutter_android/lib/src/legacy/webview_android_widget.dart
+++ b/packages/webview_flutter/webview_flutter_android/lib/src/legacy/webview_android_widget.dart
@@ -23,10 +23,12 @@ class WebViewAndroidWidget extends StatefulWidget {
     required this.callbacksHandler,
     required this.javascriptChannelRegistry,
     required this.onBuildWidget,
-    @visibleForTesting this.webViewProxy = const WebViewProxy(),
+    @visibleForTesting
+        this.webViewProxy = const WebViewProxy(),
     @visibleForTesting
         this.flutterAssetManager = const android_webview.FlutterAssetManager(),
-    @visibleForTesting this.webStorage,
+    @visibleForTesting
+        this.webStorage,
   });
 
   /// Initial parameters used to setup the WebView.
@@ -101,10 +103,12 @@ class WebViewAndroidPlatformController extends WebViewPlatformController {
     required CreationParams creationParams,
     required this.callbacksHandler,
     required this.javascriptChannelRegistry,
-    @visibleForTesting this.webViewProxy = const WebViewProxy(),
+    @visibleForTesting
+        this.webViewProxy = const WebViewProxy(),
     @visibleForTesting
         this.flutterAssetManager = const android_webview.FlutterAssetManager(),
-    @visibleForTesting android_webview.WebStorage? webStorage,
+    @visibleForTesting
+        android_webview.WebStorage? webStorage,
   })  : webStorage = webStorage ?? android_webview.WebStorage.instance,
         assert(creationParams.webSettings?.hasNavigationDelegate != null),
         super(callbacksHandler) {
@@ -618,15 +622,13 @@ class WebViewProxy {
       android_webview.WebView webView,
       android_webview.WebResourceRequest request,
       android_webview.WebResourceError error,
-    )?
-        onReceivedRequestError,
+    )? onReceivedRequestError,
     void Function(
       android_webview.WebView webView,
       int errorCode,
       String description,
       String failingUrl,
-    )?
-        onReceivedError,
+    )? onReceivedError,
     void Function(android_webview.WebView webView,
             android_webview.WebResourceRequest request)?
         requestLoading,
diff --git a/packages/webview_flutter/webview_flutter_android/test/android_webview_controller_test.dart b/packages/webview_flutter/webview_flutter_android/test/android_webview_controller_test.dart
index a9a4b0e49bb..b5214889c95 100644
--- a/packages/webview_flutter/webview_flutter_android/test/android_webview_controller_test.dart
+++ b/packages/webview_flutter/webview_flutter_android/test/android_webview_controller_test.dart
@@ -52,10 +52,8 @@ void main() {
       Future<List<String>> Function(
         android_webview.WebView webView,
         android_webview.FileChooserParams params,
-      )?
-          onShowFileChooser,
-    })?
-        createWebChromeClient,
+      )? onShowFileChooser,
+    })? createWebChromeClient,
     android_webview.WebView? mockWebView,
     android_webview.WebViewClient? mockWebViewClient,
     android_webview.WebStorage? mockWebStorage,
@@ -75,8 +73,7 @@ void main() {
                     Future<List<String>> Function(
                       android_webview.WebView webView,
                       android_webview.FileChooserParams params,
-                    )?
-                        onShowFileChooser,
+                    )? onShowFileChooser,
                   }) =>
                       MockWebChromeClient(),
               createAndroidWebView: ({required bool useHybridComposition}) =>
@@ -92,19 +89,16 @@ void main() {
                   int errorCode,
                   String description,
                   String failingUrl,
-                )?
-                        onReceivedError,
+                )? onReceivedError,
                 void Function(
                   android_webview.WebView webView,
                   android_webview.WebResourceRequest request,
                   android_webview.WebResourceError error,
-                )?
-                    onReceivedRequestError,
+                )? onReceivedRequestError,
                 void Function(
                   android_webview.WebView webView,
                   android_webview.WebResourceRequest request,
-                )?
-                    requestLoading,
+                )? requestLoading,
                 void Function(android_webview.WebView webView, String url)?
                     urlLoading,
               }) =>
@@ -565,8 +559,7 @@ void main() {
           Future<List<String>> Function(
             android_webview.WebView webView,
             android_webview.FileChooserParams params,
-          )?
-              onShowFileChooser,
+          )? onShowFileChooser,
         }) {
           onShowFileChooserCallback = onShowFileChooser!;
           return mockWebChromeClient;
diff --git a/packages/webview_flutter/webview_flutter_android/test/android_webview_controller_test.mocks.dart b/packages/webview_flutter/webview_flutter_android/test/android_webview_controller_test.mocks.dart
index 2aaab4f2c89..7cb79026b09 100644
--- a/packages/webview_flutter/webview_flutter_android/test/android_webview_controller_test.mocks.dart
+++ b/packages/webview_flutter/webview_flutter_android/test/android_webview_controller_test.mocks.dart
@@ -701,26 +701,22 @@ class MockAndroidWebViewProxy extends _i1.Mock
     void Function(
       _i2.WebView,
       int,
-    )?
-        onProgressChanged,
+    )? onProgressChanged,
     _i9.Future<List<String>> Function(
       _i2.WebView,
       _i2.FileChooserParams,
-    )?
-        onShowFileChooser,
+    )? onShowFileChooser,
   }) get createAndroidWebChromeClient => (super.noSuchMethod(
         Invocation.getter(#createAndroidWebChromeClient),
         returnValue: ({
           void Function(
             _i2.WebView,
             int,
-          )?
-              onProgressChanged,
+          )? onProgressChanged,
           _i9.Future<List<String>> Function(
             _i2.WebView,
             _i2.FileChooserParams,
-          )?
-              onShowFileChooser,
+          )? onShowFileChooser,
         }) =>
             _FakeWebChromeClient_0(
           this,
@@ -730,13 +726,11 @@ class MockAndroidWebViewProxy extends _i1.Mock
           void Function(
             _i2.WebView,
             int,
-          )?
-              onProgressChanged,
+          )? onProgressChanged,
           _i9.Future<List<String>> Function(
             _i2.WebView,
             _i2.FileChooserParams,
-          )?
-              onShowFileChooser,
+          )? onShowFileChooser,
         }) =>
             _FakeWebChromeClient_0(
           this,
@@ -746,85 +740,71 @@ class MockAndroidWebViewProxy extends _i1.Mock
         void Function(
           _i2.WebView,
           int,
-        )?
-            onProgressChanged,
+        )? onProgressChanged,
         _i9.Future<List<String>> Function(
           _i2.WebView,
           _i2.FileChooserParams,
-        )?
-            onShowFileChooser,
+        )? onShowFileChooser,
       }));
   @override
   _i2.WebViewClient Function({
     void Function(
       _i2.WebView,
       String,
-    )?
-        onPageFinished,
+    )? onPageFinished,
     void Function(
       _i2.WebView,
       String,
-    )?
-        onPageStarted,
+    )? onPageStarted,
     void Function(
       _i2.WebView,
       int,
       String,
       String,
-    )?
-        onReceivedError,
+    )? onReceivedError,
     void Function(
       _i2.WebView,
       _i2.WebResourceRequest,
       _i2.WebResourceError,
-    )?
-        onReceivedRequestError,
+    )? onReceivedRequestError,
     void Function(
       _i2.WebView,
       _i2.WebResourceRequest,
-    )?
-        requestLoading,
+    )? requestLoading,
     void Function(
       _i2.WebView,
       String,
-    )?
-        urlLoading,
+    )? urlLoading,
   }) get createAndroidWebViewClient => (super.noSuchMethod(
         Invocation.getter(#createAndroidWebViewClient),
         returnValue: ({
           void Function(
             _i2.WebView,
             String,
-          )?
-              onPageFinished,
+          )? onPageFinished,
           void Function(
             _i2.WebView,
             String,
-          )?
-              onPageStarted,
+          )? onPageStarted,
           void Function(
             _i2.WebView,
             int,
             String,
             String,
-          )?
-              onReceivedError,
+          )? onReceivedError,
           void Function(
             _i2.WebView,
             _i2.WebResourceRequest,
             _i2.WebResourceError,
-          )?
-              onReceivedRequestError,
+          )? onReceivedRequestError,
           void Function(
             _i2.WebView,
             _i2.WebResourceRequest,
-          )?
-              requestLoading,
+          )? requestLoading,
           void Function(
             _i2.WebView,
             String,
-          )?
-              urlLoading,
+          )? urlLoading,
         }) =>
             _FakeWebViewClient_1(
           this,
@@ -834,36 +814,30 @@ class MockAndroidWebViewProxy extends _i1.Mock
           void Function(
             _i2.WebView,
             String,
-          )?
-              onPageFinished,
+          )? onPageFinished,
           void Function(
             _i2.WebView,
             String,
-          )?
-              onPageStarted,
+          )? onPageStarted,
           void Function(
             _i2.WebView,
             int,
             String,
             String,
-          )?
-              onReceivedError,
+          )? onReceivedError,
           void Function(
             _i2.WebView,
             _i2.WebResourceRequest,
             _i2.WebResourceError,
-          )?
-              onReceivedRequestError,
+          )? onReceivedRequestError,
           void Function(
             _i2.WebView,
             _i2.WebResourceRequest,
-          )?
-              requestLoading,
+          )? requestLoading,
           void Function(
             _i2.WebView,
             String,
-          )?
-              urlLoading,
+          )? urlLoading,
         }) =>
             _FakeWebViewClient_1(
           this,
@@ -873,36 +847,30 @@ class MockAndroidWebViewProxy extends _i1.Mock
         void Function(
           _i2.WebView,
           String,
-        )?
-            onPageFinished,
+        )? onPageFinished,
         void Function(
           _i2.WebView,
           String,
-        )?
-            onPageStarted,
+        )? onPageStarted,
         void Function(
           _i2.WebView,
           int,
           String,
           String,
-        )?
-            onReceivedError,
+        )? onReceivedError,
         void Function(
           _i2.WebView,
           _i2.WebResourceRequest,
           _i2.WebResourceError,
-        )?
-            onReceivedRequestError,
+        )? onReceivedRequestError,
         void Function(
           _i2.WebView,
           _i2.WebResourceRequest,
-        )?
-            requestLoading,
+        )? requestLoading,
         void Function(
           _i2.WebView,
           String,
-        )?
-            urlLoading,
+        )? urlLoading,
       }));
   @override
   _i2.FlutterAssetManager Function() get createFlutterAssetManager =>
@@ -951,8 +919,7 @@ class MockAndroidWebViewProxy extends _i1.Mock
         String,
         String,
         int,
-      )
-          onDownloadStart}) get createDownloadListener => (super.noSuchMethod(
+      ) onDownloadStart}) get createDownloadListener => (super.noSuchMethod(
         Invocation.getter(#createDownloadListener),
         returnValue: (
                 {required void Function(
@@ -961,8 +928,7 @@ class MockAndroidWebViewProxy extends _i1.Mock
                   String,
                   String,
                   int,
-                )
-                    onDownloadStart}) =>
+                ) onDownloadStart}) =>
             _FakeDownloadListener_2(
           this,
           Invocation.getter(#createDownloadListener),
@@ -974,8 +940,7 @@ class MockAndroidWebViewProxy extends _i1.Mock
                   String,
                   String,
                   int,
-                )
-                    onDownloadStart}) =>
+                ) onDownloadStart}) =>
             _FakeDownloadListener_2(
           this,
           Invocation.getter(#createDownloadListener),
@@ -987,8 +952,7 @@ class MockAndroidWebViewProxy extends _i1.Mock
             String,
             String,
             int,
-          )
-              onDownloadStart}));
+          ) onDownloadStart}));
   @override
   _i9.Future<void> setWebContentsDebuggingEnabled(bool? enabled) =>
       (super.noSuchMethod(
@@ -1061,8 +1025,8 @@ class MockAndroidWebViewWidgetCreationParams extends _i1.Mock
       (super.noSuchMethod(
         Invocation.getter(#gestureRecognizers),
         returnValue: <_i11.Factory<_i12.OneSequenceGestureRecognizer>>{},
-        returnValueForMissingStub: <
-            _i11.Factory<_i12.OneSequenceGestureRecognizer>>{},
+        returnValueForMissingStub: <_i11
+            .Factory<_i12.OneSequenceGestureRecognizer>>{},
       ) as Set<_i11.Factory<_i12.OneSequenceGestureRecognizer>>);
 }
 
diff --git a/packages/webview_flutter/webview_flutter_android/test/legacy/webview_android_widget_test.mocks.dart b/packages/webview_flutter/webview_flutter_android/test/legacy/webview_android_widget_test.mocks.dart
index 0562bb7b09d..67cdaa8bd58 100644
--- a/packages/webview_flutter/webview_flutter_android/test/legacy/webview_android_widget_test.mocks.dart
+++ b/packages/webview_flutter/webview_flutter_android/test/legacy/webview_android_widget_test.mocks.dart
@@ -962,36 +962,30 @@ class MockWebViewProxy extends _i1.Mock implements _i7.WebViewProxy {
     void Function(
       _i2.WebView,
       String,
-    )?
-        onPageStarted,
+    )? onPageStarted,
     void Function(
       _i2.WebView,
       String,
-    )?
-        onPageFinished,
+    )? onPageFinished,
     void Function(
       _i2.WebView,
       _i2.WebResourceRequest,
       _i2.WebResourceError,
-    )?
-        onReceivedRequestError,
+    )? onReceivedRequestError,
     void Function(
       _i2.WebView,
       int,
       String,
       String,
-    )?
-        onReceivedError,
+    )? onReceivedError,
     void Function(
       _i2.WebView,
       _i2.WebResourceRequest,
-    )?
-        requestLoading,
+    )? requestLoading,
     void Function(
       _i2.WebView,
       String,
-    )?
-        urlLoading,
+    )? urlLoading,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/legacy/web_kit_webview_widget.dart b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/legacy/web_kit_webview_widget.dart
index 4d10db96a29..7d169bf979a 100644
--- a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/legacy/web_kit_webview_widget.dart
+++ b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/legacy/web_kit_webview_widget.dart
@@ -655,8 +655,7 @@ class WebViewWidgetProxy {
       String keyPath,
       NSObject object,
       Map<NSKeyValueChangeKey, Object?> change,
-    )?
-        observeValue,
+    )? observeValue,
   }) {
     return WKWebView(configuration, observeValue: observeValue);
   }
@@ -666,8 +665,7 @@ class WebViewWidgetProxy {
     required void Function(
       WKUserContentController userContentController,
       WKScriptMessage message,
-    )
-        didReceiveScriptMessage,
+    ) didReceiveScriptMessage,
   }) {
     return WKScriptMessageHandler(
       didReceiveScriptMessage: didReceiveScriptMessage,
@@ -680,8 +678,7 @@ class WebViewWidgetProxy {
       WKWebView webView,
       WKWebViewConfiguration configuration,
       WKNavigationAction navigationAction,
-    )?
-        onCreateWebView,
+    )? onCreateWebView,
   }) {
     return WKUIDelegate(onCreateWebView: onCreateWebView);
   }
@@ -694,8 +691,7 @@ class WebViewWidgetProxy {
     Future<WKNavigationActionPolicy> Function(
       WKWebView webView,
       WKNavigationAction navigationAction,
-    )?
-        decidePolicyForNavigationAction,
+    )? decidePolicyForNavigationAction,
     void Function(WKWebView webView, NSError error)? didFailNavigation,
     void Function(WKWebView webView, NSError error)?
         didFailProvisionalNavigation,
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/webkit_proxy.dart b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/webkit_proxy.dart
index 3e8d6796069..e25fdf1e354 100644
--- a/packages/webview_flutter/webview_flutter_wkwebview/lib/src/webkit_proxy.dart
+++ b/packages/webview_flutter/webview_flutter_wkwebview/lib/src/webkit_proxy.dart
@@ -38,8 +38,7 @@ class WebKitProxy {
       String keyPath,
       NSObject object,
       Map<NSKeyValueChangeKey, Object?> change,
-    )?
-        observeValue,
+    )? observeValue,
     InstanceManager? instanceManager,
   }) createWebView;
 
@@ -53,8 +52,7 @@ class WebKitProxy {
     required void Function(
       WKUserContentController userContentController,
       WKScriptMessage message,
-    )
-        didReceiveScriptMessage,
+    ) didReceiveScriptMessage,
   }) createScriptMessageHandler;
 
   /// The default [WKWebsiteDataStore].
@@ -68,8 +66,7 @@ class WebKitProxy {
     Future<WKNavigationActionPolicy> Function(
       WKWebView webView,
       WKNavigationAction navigationAction,
-    )?
-        decidePolicyForNavigationAction,
+    )? decidePolicyForNavigationAction,
     void Function(WKWebView webView, NSError error)? didFailNavigation,
     void Function(WKWebView webView, NSError error)?
         didFailProvisionalNavigation,
@@ -82,7 +79,6 @@ class WebKitProxy {
       WKWebView webView,
       WKWebViewConfiguration configuration,
       WKNavigationAction navigationAction,
-    )?
-        onCreateWebView,
+    )? onCreateWebView,
   }) createUIDelegate;
 }
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/test/legacy/web_kit_webview_widget_test.dart b/packages/webview_flutter/webview_flutter_wkwebview/test/legacy/web_kit_webview_widget_test.dart
index 7982be1c035..2a36d591eb5 100644
--- a/packages/webview_flutter/webview_flutter_wkwebview/test/legacy/web_kit_webview_widget_test.dart
+++ b/packages/webview_flutter/webview_flutter_wkwebview/test/legacy/web_kit_webview_widget_test.dart
@@ -221,8 +221,7 @@ void main() {
         );
 
         verify(mockWebViewConfiguration
-            .setMediaTypesRequiringUserActionForPlayback(<
-                WKAudiovisualMediaType>{
+            .setMediaTypesRequiringUserActionForPlayback(<WKAudiovisualMediaType>{
           WKAudiovisualMediaType.all,
         }));
       });
@@ -240,8 +239,7 @@ void main() {
         );
 
         verify(mockWebViewConfiguration
-            .setMediaTypesRequiringUserActionForPlayback(<
-                WKAudiovisualMediaType>{
+            .setMediaTypesRequiringUserActionForPlayback(<WKAudiovisualMediaType>{
           WKAudiovisualMediaType.none,
         }));
       });
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/test/legacy/web_kit_webview_widget_test.mocks.dart b/packages/webview_flutter/webview_flutter_wkwebview/test/legacy/web_kit_webview_widget_test.mocks.dart
index 1680997d585..e02b3fae518 100644
--- a/packages/webview_flutter/webview_flutter_wkwebview/test/legacy/web_kit_webview_widget_test.mocks.dart
+++ b/packages/webview_flutter/webview_flutter_wkwebview/test/legacy/web_kit_webview_widget_test.mocks.dart
@@ -1174,8 +1174,7 @@ class MockWebViewWidgetProxy extends _i1.Mock
       String,
       _i7.NSObject,
       Map<_i7.NSKeyValueChangeKey, Object?>,
-    )?
-        observeValue,
+    )? observeValue,
   }) =>
       (super.noSuchMethod(
         Invocation.method(
@@ -1197,8 +1196,7 @@ class MockWebViewWidgetProxy extends _i1.Mock
           {required void Function(
             _i4.WKUserContentController,
             _i4.WKScriptMessage,
-          )?
-              didReceiveScriptMessage}) =>
+          )? didReceiveScriptMessage}) =>
       (super.noSuchMethod(
         Invocation.method(
           #createScriptMessageHandler,
@@ -1220,8 +1218,7 @@ class MockWebViewWidgetProxy extends _i1.Mock
             _i4.WKWebView,
             _i4.WKWebViewConfiguration,
             _i4.WKNavigationAction,
-          )?
-              onCreateWebView}) =>
+          )? onCreateWebView}) =>
       (super.noSuchMethod(
         Invocation.method(
           #createUIDelgate,
@@ -1242,28 +1239,23 @@ class MockWebViewWidgetProxy extends _i1.Mock
     void Function(
       _i4.WKWebView,
       String?,
-    )?
-        didFinishNavigation,
+    )? didFinishNavigation,
     void Function(
       _i4.WKWebView,
       String?,
-    )?
-        didStartProvisionalNavigation,
+    )? didStartProvisionalNavigation,
     _i5.Future<_i4.WKNavigationActionPolicy> Function(
       _i4.WKWebView,
       _i4.WKNavigationAction,
-    )?
-        decidePolicyForNavigationAction,
+    )? decidePolicyForNavigationAction,
     void Function(
       _i4.WKWebView,
       _i7.NSError,
-    )?
-        didFailNavigation,
+    )? didFailNavigation,
     void Function(
       _i4.WKWebView,
       _i7.NSError,
-    )?
-        didFailProvisionalNavigation,
+    )? didFailProvisionalNavigation,
     void Function(_i4.WKWebView)? webViewWebContentProcessDidTerminate,
   }) =>
       (super.noSuchMethod(
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/test/webkit_webview_controller_test.dart b/packages/webview_flutter/webview_flutter_wkwebview/test/webkit_webview_controller_test.dart
index b7b729a9792..abf3f798d92 100644
--- a/packages/webview_flutter/webview_flutter_wkwebview/test/webkit_webview_controller_test.dart
+++ b/packages/webview_flutter/webview_flutter_wkwebview/test/webkit_webview_controller_test.dart
@@ -45,10 +45,8 @@ void main() {
           String keyPath,
           NSObject object,
           Map<NSKeyValueChangeKey, Object?> change,
-        )?
-            observeValue,
-      })?
-          createMockWebView,
+        )? observeValue,
+      })? createMockWebView,
       MockWKWebViewConfiguration? mockWebViewConfiguration,
       InstanceManager? instanceManager,
     }) {
@@ -68,8 +66,7 @@ void main() {
               String keyPath,
               NSObject object,
               Map<NSKeyValueChangeKey, Object?> change,
-            )?
-                observeValue,
+            )? observeValue,
             InstanceManager? instanceManager,
           }) {
             nonNullMockWebView = createMockWebView == null
@@ -661,8 +658,7 @@ void main() {
           required void Function(
             WKUserContentController userContentController,
             WKScriptMessage message,
-          )
-              didReceiveScriptMessage,
+          ) didReceiveScriptMessage,
         }) {
           return WKScriptMessageHandler.detached(
             didReceiveScriptMessage: didReceiveScriptMessage,
@@ -707,8 +703,7 @@ void main() {
           required void Function(
             WKUserContentController userContentController,
             WKScriptMessage message,
-          )
-              didReceiveScriptMessage,
+          ) didReceiveScriptMessage,
         }) {
           return WKScriptMessageHandler.detached(
             didReceiveScriptMessage: didReceiveScriptMessage,
@@ -747,8 +742,7 @@ void main() {
           required void Function(
             WKUserContentController userContentController,
             WKScriptMessage message,
-          )
-              didReceiveScriptMessage,
+          ) didReceiveScriptMessage,
         }) {
           return WKScriptMessageHandler.detached(
             didReceiveScriptMessage: didReceiveScriptMessage,
@@ -838,8 +832,7 @@ void main() {
             String keyPath,
             NSObject object,
             Map<NSKeyValueChangeKey, Object?> change,
-          )?
-              observeValue,
+          )? observeValue,
         }) {
           webViewObserveValue = observeValue!;
           return mockWebView;
@@ -900,8 +893,7 @@ void main() {
             String keyPath,
             NSObject object,
             Map<NSKeyValueChangeKey, Object?> change,
-          )?
-              observeValue,
+          )? observeValue,
         }) {
           webViewObserveValue = observeValue!;
           return mockWebView;
@@ -966,8 +958,7 @@ void main() {
           required void Function(
             WKUserContentController userContentController,
             WKScriptMessage message,
-          )
-              didReceiveScriptMessage,
+          ) didReceiveScriptMessage,
         }) {
           messageHandler = WKScriptMessageHandler.detached(
             didReceiveScriptMessage: didReceiveScriptMessage,
diff --git a/packages/webview_flutter/webview_flutter_wkwebview/test/webkit_webview_widget_test.dart b/packages/webview_flutter/webview_flutter_wkwebview/test/webkit_webview_widget_test.dart
index 2a6434be4f0..bc02bea0328 100644
--- a/packages/webview_flutter/webview_flutter_wkwebview/test/webkit_webview_widget_test.dart
+++ b/packages/webview_flutter/webview_flutter_wkwebview/test/webkit_webview_widget_test.dart
@@ -32,8 +32,7 @@ void main() {
                 String keyPath,
                 NSObject object,
                 Map<NSKeyValueChangeKey, Object?> change,
-              )?
-                  observeValue,
+              )? observeValue,
               InstanceManager? instanceManager,
             }) {
               final WKWebView webView = WKWebView.detached(