From ec387a467a68fcef5a2a5a95aee3fd201cee0d8a Mon Sep 17 00:00:00 2001
From: Victoria Ashworth <15619084+vashworth@users.noreply.github.com>
Date: Mon, 28 Aug 2023 12:34:23 -0500
Subject: [PATCH] Revert "ShortcutManager should dispatch creation in
 constructor." (#133472)

Reverts flutter/flutter#133356

Tree is failing on customer_testing on this PR.
https://ci.chromium.org/ui/p/flutter/builders/prod/Mac%20customer_testing/14646/overview
---
 .../flutter/lib/src/widgets/shortcuts.dart    |  7 +-----
 .../flutter/test/widgets/shortcuts_test.dart  | 22 +++++--------------
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/packages/flutter/lib/src/widgets/shortcuts.dart b/packages/flutter/lib/src/widgets/shortcuts.dart
index c0118e633f..5c66c42997 100644
--- a/packages/flutter/lib/src/widgets/shortcuts.dart
+++ b/packages/flutter/lib/src/widgets/shortcuts.dart
@@ -747,11 +747,7 @@ class ShortcutManager with Diagnosticable, ChangeNotifier {
   ShortcutManager({
     Map<ShortcutActivator, Intent> shortcuts = const <ShortcutActivator, Intent>{},
     this.modal = false,
-  })  : _shortcuts = shortcuts {
-    if (kFlutterMemoryAllocationsEnabled) {
-      maybeDispatchObjectCreation();
-    }
-  }
+  })  : _shortcuts = shortcuts;
 
   /// True if the [ShortcutManager] should not pass on keys that it doesn't
   /// handle to any key-handling widgets that are ancestors to this one.
@@ -1444,7 +1440,6 @@ class _ShortcutRegistrarState extends State<ShortcutRegistrar> {
   void dispose() {
     registry.removeListener(_shortcutsChanged);
     registry.dispose();
-    manager.dispose();
     super.dispose();
   }
 
diff --git a/packages/flutter/test/widgets/shortcuts_test.dart b/packages/flutter/test/widgets/shortcuts_test.dart
index fedf7f9cd2..064fdfb231 100644
--- a/packages/flutter/test/widgets/shortcuts_test.dart
+++ b/packages/flutter/test/widgets/shortcuts_test.dart
@@ -666,19 +666,6 @@ void main() {
       expect(pressedKeys, isEmpty);
     });
 
-    test('$ShortcutManager dispatches object creation in constructor', () {
-      int eventCount = 0;
-      void listener(ObjectEvent event) => eventCount++;
-      MemoryAllocations.instance.addListener(listener);
-
-      final ShortcutManager registry = ShortcutManager();
-
-      expect(eventCount, 1);
-
-      registry.dispose();
-      MemoryAllocations.instance.removeListener(listener);
-    });
-
     testWidgets("Shortcuts passes to the next Shortcuts widget if it doesn't map the key", (WidgetTester tester) async {
       final GlobalKey containerKey = GlobalKey();
       final List<LogicalKeyboardKey> pressedKeys = <LogicalKeyboardKey>[];
@@ -1866,17 +1853,20 @@ void main() {
       token.dispose();
     });
 
-    test('dispatches object creation in constructor', () {
+    testWidgets('dispatches object creation in constructor', (WidgetTester tester) async {
+      final MemoryAllocations ma = MemoryAllocations.instance;
+      assert(!ma.hasListeners);
       int eventCount = 0;
       void listener(ObjectEvent event) => eventCount++;
-      MemoryAllocations.instance.addListener(listener);
+      ma.addListener(listener);
 
       final ShortcutRegistry registry = ShortcutRegistry();
 
       expect(eventCount, 1);
 
       registry.dispose();
-      MemoryAllocations.instance.removeListener(listener);
+      ma.removeListener(listener);
+      assert(!ma.hasListeners);
     });
   });
 }