[ci] Manual flutter roll (#4033)

Attempt to manually roll flutter (stable and master), fixing what's preventing the auto-rolls:

* [flutter_markdown] Teach a mock AssetManager of the new .smcbin asset file format.
* [google_sign_in] dart format .
* [webview_flutter] dart format .

.ci/flutter_master.version

@@ -1 +1 @@
-a76dbe44b99ef54515169a48c70a8ba8db1cb0e1
+d0d1feb6283f4e812e9784b40409f732a068ff76

.ci/flutter_stable.version

@@ -1 +1 @@
-84a1e904f44f9b0e9c4510138010edcc653163f8
+d3d8effc686d73e0114d71abdcccef63fa1f25d2

packages/flutter_markdown/test/utils.dart

@@ -192,6 +192,10 @@ class TestAssetBundle extends CachingAssetBundle {
       final ByteData manifest = const StandardMessageCodec().encodeMessage(
           <String, List<Object>>{'assets/logo.png': <Object>[]})!;
       return Future<ByteData>.value(manifest);
+    } else if (key == 'AssetManifest.smcbin') {
+      final ByteData manifest = const StandardMessageCodec().encodeMessage(
+          <String, List<Object>>{'assets/logo.png': <Object>[]})!;
+      return Future<ByteData>.value(manifest);
     } else if (key == 'assets/logo.png') {
       // The root directory tests are run from is different for 'flutter test'
       // verses 'flutter test test/*_test.dart'. Adjust the root directory

packages/google_sign_in/google_sign_in_web/lib/google_sign_in_web.dart

@@ -47,13 +47,10 @@ class GoogleSignInPlugin extends GoogleSignInPlatform {
   /// For tests, the plugin can skip its loading process with [debugOverrideLoader],
   /// and the implementation of the underlying GIS SDK client through [debugOverrideGisSdkClient].
   GoogleSignInPlugin({
+    @visibleForTesting bool debugOverrideLoader = false,
+    @visibleForTesting GisSdkClient? debugOverrideGisSdkClient,
     @visibleForTesting
-        bool debugOverrideLoader = false,
-    @visibleForTesting
-        GisSdkClient? debugOverrideGisSdkClient,
-    @visibleForTesting
-        StreamController<GoogleSignInUserData?>?
-            debugOverrideUserDataController,
+    StreamController<GoogleSignInUserData?>? debugOverrideUserDataController,
   })  : _gisSdkClient = debugOverrideGisSdkClient,
         _userDataController = debugOverrideUserDataController ??
             StreamController<GoogleSignInUserData?>.broadcast() {

packages/webview_flutter/webview_flutter_android/lib/src/android_proxy.dart

@@ -51,7 +51,7 @@ class AndroidWebViewProxy {
       android_webview.WebResourceError error,
     )? onReceivedRequestError,
     @Deprecated('Only called on Android version < 23.')
-        void Function(
+    void Function(
       android_webview.WebView webView,
       int errorCode,
       String description,

packages/webview_flutter/webview_flutter_android/lib/src/android_webview_controller.dart

@@ -43,9 +43,8 @@ class AndroidWebViewControllerCreationParams
     // ignore: avoid_unused_constructor_parameters
     PlatformWebViewControllerCreationParams params, {
     @visibleForTesting
-        AndroidWebViewProxy androidWebViewProxy = const AndroidWebViewProxy(),
-    @visibleForTesting
-        android_webview.WebStorage? androidWebStorage,
+    AndroidWebViewProxy androidWebViewProxy = const AndroidWebViewProxy(),
+    @visibleForTesting android_webview.WebStorage? androidWebStorage,
   }) {
     return AndroidWebViewControllerCreationParams(
       androidWebViewProxy: androidWebViewProxy,
@@ -195,7 +194,7 @@ class AndroidWebViewController extends PlatformWebViewController {
   static Future<void> enableDebugging(
     bool enabled, {
     @visibleForTesting
-        AndroidWebViewProxy webViewProxy = const AndroidWebViewProxy(),
+    AndroidWebViewProxy webViewProxy = const AndroidWebViewProxy(),
   }) {
     return webViewProxy.setWebContentsDebuggingEnabled(enabled);
   }
@@ -550,7 +549,7 @@ class AndroidJavaScriptChannelParams extends JavaScriptChannelParams {
     required super.name,
     required super.onMessageReceived,
     @visibleForTesting
-        AndroidWebViewProxy webViewProxy = const AndroidWebViewProxy(),
+    AndroidWebViewProxy webViewProxy = const AndroidWebViewProxy(),
   })  : assert(name.isNotEmpty),
         _javaScriptChannel = webViewProxy.createJavaScriptChannel(
           name,
@@ -575,7 +574,7 @@ class AndroidJavaScriptChannelParams extends JavaScriptChannelParams {
   AndroidJavaScriptChannelParams.fromJavaScriptChannelParams(
     JavaScriptChannelParams params, {
     @visibleForTesting
-        AndroidWebViewProxy webViewProxy = const AndroidWebViewProxy(),
+    AndroidWebViewProxy webViewProxy = const AndroidWebViewProxy(),
   }) : this(
           name: params.name,
           onMessageReceived: params.onMessageReceived,
@@ -600,10 +599,9 @@ class AndroidWebViewWidgetCreationParams
     super.layoutDirection,
     super.gestureRecognizers,
     this.displayWithHybridComposition = false,
+    @visibleForTesting InstanceManager? instanceManager,
     @visibleForTesting
-        InstanceManager? instanceManager,
-    @visibleForTesting
-        this.platformViewsServiceProxy = const PlatformViewsServiceProxy(),
+    this.platformViewsServiceProxy = const PlatformViewsServiceProxy(),
   }) : instanceManager =
             instanceManager ?? android_webview.JavaObject.globalInstanceManager;
 
@@ -801,7 +799,7 @@ class AndroidNavigationDelegateCreationParams
     // ignore: avoid_unused_constructor_parameters
     PlatformNavigationDelegateCreationParams params, {
     @visibleForTesting
-        AndroidWebViewProxy androidWebViewProxy = const AndroidWebViewProxy(),
+    AndroidWebViewProxy androidWebViewProxy = const AndroidWebViewProxy(),
   }) {
     return AndroidNavigationDelegateCreationParams._(
       androidWebViewProxy: androidWebViewProxy,

packages/webview_flutter/webview_flutter_android/lib/src/legacy/webview_android_widget.dart

@@ -22,12 +22,10 @@ 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,
+    this.flutterAssetManager = const android_webview.FlutterAssetManager(),
+    @visibleForTesting this.webStorage,
   });
 
   /// Initial parameters used to setup the WebView.
@@ -89,12 +87,10 @@ 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,
+    this.flutterAssetManager = const android_webview.FlutterAssetManager(),
+    @visibleForTesting android_webview.WebStorage? webStorage,
   })  : webStorage = webStorage ?? android_webview.WebStorage.instance,
         assert(creationParams.webSettings?.hasNavigationDelegate != null),
         super(callbacksHandler) {

packages/webview_flutter/webview_flutter_android/test/android_webview_controller_test.dart

@@ -97,7 +97,7 @@ void main() {
                 void Function(android_webview.WebView webView, String url)?
                     onPageStarted,
                 @Deprecated('Only called on Android version < 23.')
-                    void Function(
+                void Function(
                   android_webview.WebView webView,
                   int errorCode,
                   String description,

packages/webview_flutter/webview_flutter_web/lib/src/web_webview_controller.dart

@@ -28,7 +28,7 @@ class WebWebViewControllerCreationParams
     // ignore: avoid_unused_constructor_parameters
     PlatformWebViewControllerCreationParams params, {
     @visibleForTesting
-        HttpRequestFactory httpRequestFactory = const HttpRequestFactory(),
+    HttpRequestFactory httpRequestFactory = const HttpRequestFactory(),
   }) : this(httpRequestFactory: httpRequestFactory);
 
   static int _nextIFrameId = 0;