Roll Flutter (stable) from b0850beeb25f to 80c2e84975bb (1397 revisions)

.ci/flutter_stable.version

@@ -1 +1 @@
-b0850beeb25f6d5b10426284f506557f66181b36
+80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819

packages/flutter_markdown/test/image_test.dart

@@ -13,8 +13,6 @@ import 'package:flutter_test/flutter_test.dart';
 import 'image_test_mocks.dart';
 import 'utils.dart';
 
-bool isRunningInStable = io.Platform.environment['CHANNEL'] == 'stable';
-
 void main() => defineTests();
 
 void defineTests() {
@@ -169,9 +167,8 @@ void defineTests() {
 
         await expectLater(
             find.byType(Container),
-            matchesGoldenFile(isRunningInStable
-                ? 'assets/images/golden/image_test/resource_asset_logo_old.png'
-                : 'assets/images/golden/image_test/resource_asset_logo.png'));
+            matchesGoldenFile(
+                'assets/images/golden/image_test/resource_asset_logo.png'));
       },
       skip: kIsWeb, // Goldens are platform-specific.
     );
@@ -416,9 +413,8 @@ void defineTests() {
 
         await expectLater(
             find.byType(Container),
-            matchesGoldenFile(isRunningInStable
-                ? 'assets/images/golden/image_test/custom_builder_asset_logo_old.png'
-                : 'assets/images/golden/image_test/custom_builder_asset_logo.png'));
+            matchesGoldenFile(
+                'assets/images/golden/image_test/custom_builder_asset_logo.png'));
       },
       skip: kIsWeb, // Goldens are platform-specific.
     );

script/tool/lib/src/drive_examples_command.dart

@@ -130,11 +130,8 @@ class DriveExamplesCommand extends PackageLoopingCommand {
           '--browser-name=chrome',
           if (useWasm)
             '--wasm'
-          // TODO(dit): Clean this up, https://github.com/flutter/flutter/issues/151869
-          else if (platform.environment['CHANNEL']?.toLowerCase() == 'master')
-            '--web-renderer=canvaskit'
           else
-            '--web-renderer=html',
+            '--web-renderer=canvaskit',
           if (platform.environment.containsKey('CHROME_EXECUTABLE'))
             '--chrome-binary=${platform.environment['CHROME_EXECUTABLE']}',
         ],

script/tool/test/drive_examples_command_test.dart

@@ -38,9 +38,6 @@ void main() {
       runner = CommandRunner<void>(
           'drive_examples_command', 'Test for drive_example_command');
       runner.addCommand(command);
-
-      // TODO(dit): Clean this up, https://github.com/flutter/flutter/issues/151869
-      mockPlatform.environment['CHANNEL'] = 'master';
     });
 
     void setMockFlutterDevicesOutput({
@@ -760,60 +757,6 @@ void main() {
           ]));
     });
 
-    // TODO(dit): Clean this up, https://github.com/flutter/flutter/issues/151869
-    test('drives a web plugin (html renderer in stable)', () async {
-      // Override the platform to simulate CHANNEL: stable
-      mockPlatform.environment['CHANNEL'] = 'stable';
-
-      final RepositoryPackage plugin = createFakePlugin(
-        'plugin',
-        packagesDir,
-        extraFiles: <String>[
-          'example/integration_test/plugin_test.dart',
-          'example/test_driver/integration_test.dart',
-          'example/web/index.html',
-        ],
-        platformSupport: <String, PlatformDetails>{
-          platformWeb: const PlatformDetails(PlatformSupport.inline),
-        },
-      );
-
-      final Directory pluginExampleDirectory = getExampleDir(plugin);
-
-      final List<String> output = await runCapturingPrint(runner, <String>[
-        'drive-examples',
-        '--web',
-      ]);
-
-      expect(
-        output,
-        containsAllInOrder(<Matcher>[
-          contains('Running for plugin'),
-          contains('No issues found!'),
-        ]),
-      );
-
-      expect(
-          processRunner.recordedCalls,
-          orderedEquals(<ProcessCall>[
-            ProcessCall(
-                getFlutterCommand(mockPlatform),
-                const <String>[
-                  'drive',
-                  '-d',
-                  'web-server',
-                  '--web-port=7357',
-                  '--browser-name=chrome',
-                  '--web-renderer=html',
-                  '--driver',
-                  'test_driver/integration_test.dart',
-                  '--target',
-                  'integration_test/plugin_test.dart',
-                ],
-                pluginExampleDirectory.path),
-          ]));
-    });
-
     test('runs chromedriver when requested', () async {
       final RepositoryPackage plugin = createFakePlugin(
         'plugin',