From 68836deabf88d56fa48e5ad28dfb7126c05d5a1f Mon Sep 17 00:00:00 2001
From: Kate Lovett <katelovett@google.com>
Date: Fri, 17 Sep 2021 20:13:06 -0500
Subject: [PATCH] Fix shrine (#89698)

---
 .../flutter_gallery/lib/demo/shrine/app.dart                | 5 +++++
 dev/integration_tests/flutter_gallery/test/smoke_test.dart  | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/dev/integration_tests/flutter_gallery/lib/demo/shrine/app.dart b/dev/integration_tests/flutter_gallery/lib/demo/shrine/app.dart
index 224560c0078..272248dc42d 100644
--- a/dev/integration_tests/flutter_gallery/lib/demo/shrine/app.dart
+++ b/dev/integration_tests/flutter_gallery/lib/demo/shrine/app.dart
@@ -37,6 +37,11 @@ class _ShrineAppState extends State<ShrineApp> with SingleTickerProviderStateMix
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
+      // The automatically applied scrollbars on desktop can cause a crash for
+      // demos where many scrollables are all attached to the same
+      // PrimaryScrollController. The gallery needs to be migrated before
+      // enabling this. https://github.com/flutter/gallery/issues/523
+      scrollBehavior: const MaterialScrollBehavior().copyWith(scrollbars: false),
       title: 'Shrine',
       home: HomePage(
         backdrop: Backdrop(
diff --git a/dev/integration_tests/flutter_gallery/test/smoke_test.dart b/dev/integration_tests/flutter_gallery/test/smoke_test.dart
index fba23538914..78239ba11db 100644
--- a/dev/integration_tests/flutter_gallery/test/smoke_test.dart
+++ b/dev/integration_tests/flutter_gallery/test/smoke_test.dart
@@ -176,7 +176,11 @@ Future<void> smokeGallery(WidgetTester tester) async {
 }
 
 void main() {
-  testWidgets('Flutter Gallery app smoke test', smokeGallery);
+  testWidgets(
+    'Flutter Gallery app smoke test',
+    smokeGallery,
+    variant: const TargetPlatformVariant(<TargetPlatform>{ TargetPlatform.android, TargetPlatform.macOS }),
+  );
 
   testWidgets('Flutter Gallery app smoke test with semantics', (WidgetTester tester) async {
     RendererBinding.instance!.setSemanticsEnabled(true);