Revert PRs relating to single window assumption (flutter#122369)

* Revert "Remove references to BindingBase.window (flutter#122119)"

This reverts commit c7681f0.

* Revert "Remove another reference to BindingBase.window (flutter#122341)"

This reverts commit 6ec4445.

* Revert "Reland (2): Removes single window assumptions from `flutter_test` (flutter#122233)"

This reverts commit eb3d317.

* Revert "Remove single view assumption from TestViewConfiguration (flutter#122352)"

This reverts commit 927289f.

* Revert "Updates `flutter/test/cupertino` to no longer use `TestWindow` (flutter#122325)"

This reverts commit 67e17e4.

* Revert "Updates `flutter/test/gestures` to no longer reference `TestWindow` (flutter#122327)"

This reverts commit c2a5111.

* Revert "Updates `flutter/test/rendering` to no longer use `TestWindow` (flutter#122347)"

This reverts commit 28b65e0.

* Revert "Updates `flutter_localizations/test` to stop using `TestWindow` (flutter#122321)"

This reverts commit 01367d5.

Author: Casey Hillers

dev/benchmarks/microbenchmarks/lib/stocks/layout_bench.dart

@@ -31,13 +31,13 @@ Future<void> main() async {
     await tester.pump(); // Start drawer animation
     await tester.pump(const Duration(seconds: 1)); // Complete drawer animation
 
-    final TestViewConfiguration big = TestViewConfiguration.fromView(
+    final TestViewConfiguration big = TestViewConfiguration(
       size: const Size(360.0, 640.0),
-      view: tester.view,
+      window: RendererBinding.instance.window,
     );
-    final TestViewConfiguration small = TestViewConfiguration.fromView(
+    final TestViewConfiguration small = TestViewConfiguration(
       size: const Size(355.0, 635.0),
-      view: tester.view,
+      window: RendererBinding.instance.window,
     );
     final RenderView renderView = WidgetsBinding.instance.renderView;
     binding.framePolicy = LiveTestWidgetsFlutterBindingFramePolicy.benchmark;

dev/benchmarks/test_apps/stocks/test/icon_color_test.dart

@@ -58,8 +58,8 @@ void main() {
     expect(find.text('Account Balance'), findsNothing);
 
     // drag the drawer out
-    final Offset left = Offset(0.0, (tester.view.physicalSize / tester.view.devicePixelRatio).height / 2.0);
-    final Offset right = Offset((tester.view.physicalSize / tester.view.devicePixelRatio).width, left.dy);
+    final Offset left = Offset(0.0, (WidgetsBinding.instance.window.physicalSize / WidgetsBinding.instance.window.devicePixelRatio).height / 2.0);
+    final Offset right = Offset((WidgetsBinding.instance.window.physicalSize / WidgetsBinding.instance.window.devicePixelRatio).width, left.dy);
     final TestGesture gesture = await tester.startGesture(left);
     await tester.pump();
     await gesture.moveTo(right);

packages/flutter/lib/src/widgets/binding.dart

@@ -901,13 +901,15 @@ mixin WidgetsBinding on BindingBase, ServicesBinding, SchedulerBinding, GestureB
   /// Used by [runApp] to wrap the provided `rootWidget` in the default [View].
   ///
   /// The [View] determines into what [FlutterView] the app is rendered into.
-  /// This is currently [PlatformDispatcher.implicitView] from [platformDispatcher].
+  /// For backwards-compatibility reasons, this method currently chooses
+  /// [window] (which is a [FlutterView]) as the rendering target. This will
+  /// change in a future version of Flutter.
   ///
   /// The `rootWidget` widget provided to this method must not already be
   /// wrapped in a [View].
   Widget wrapWithDefaultView(Widget rootWidget) {
     return View(
-      view: platformDispatcher.implicitView!,
+      view: window,
       child: rootWidget,
     );
   }

packages/flutter/test/cupertino/route_test.dart

@@ -1702,7 +1702,6 @@ void main() {
     ];
     await tester.pumpWidget(
       buildNavigator(
-        view: tester.view,
         pages: myPages,
         onPopPage: (Route<dynamic> route, dynamic result) {
           assert(false); // The test shouldn't call this.
@@ -1729,7 +1728,6 @@ void main() {
 
     await tester.pumpWidget(
       buildNavigator(
-        view: tester.view,
         pages: myPages,
         onPopPage: (Route<dynamic> route, dynamic result) {
           assert(false); // The test shouldn't call this.
@@ -1758,7 +1756,6 @@ void main() {
     ];
     await tester.pumpWidget(
       buildNavigator(
-        view: tester.view,
         pages: myPages,
         onPopPage: (Route<dynamic> route, dynamic result) {
           assert(false); // The test shouldn't call this.
@@ -1780,7 +1777,6 @@ void main() {
 
     await tester.pumpWidget(
       buildNavigator(
-        view: tester.view,
         pages: myPages,
         onPopPage: (Route<dynamic> route, dynamic result) {
           assert(false); // The test shouldn't call this.
@@ -2217,13 +2213,12 @@ class TransitionDetector extends DefaultTransitionDelegate<void> {
 
 Widget buildNavigator({
   required List<Page<dynamic>> pages,
-  required FlutterView view,
   PopPageCallback? onPopPage,
   GlobalKey<NavigatorState>? key,
   TransitionDelegate<dynamic>? transitionDelegate,
 }) {
   return MediaQuery(
-    data: MediaQueryData.fromView(view),
+    data: MediaQueryData.fromView(WidgetsBinding.instance.window),
     child: Localizations(
       locale: const Locale('en', 'US'),
       delegates: const <LocalizationsDelegate<dynamic>>[

packages/flutter/test/cupertino/scrollbar_test.dart

@@ -251,7 +251,7 @@ void main() {
 
     const double inset = 3;
     const double scaleFactor = 2;
-    final Size screenSize = tester.view.physicalSize / tester.view.devicePixelRatio;
+    final Size screenSize = tester.binding.window.physicalSize / tester.binding.window.devicePixelRatio;
 
     final ScrollController scrollController = ScrollController();
     await tester.pumpWidget(

packages/flutter/test/cupertino/text_field_test.dart

@@ -2,10 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// no-shuffle:
+//   //TODO(gspencergoog): Remove this tag once this test's state leaks/test
+//   dependencies have been fixed.
+//   https://github.com/flutter/flutter/issues/85160
+//   Fails with "flutter test --test-randomize-ordering-seed=456"
 // reduced-test-set:
 //   This file is run as part of a reduced test set in CI on Mac and Windows
 //   machines.
-@Tags(<String>['reduced-test-set'])
+@Tags(<String>['reduced-test-set', 'no-shuffle'])
 library;
 
 import 'dart:ui' as ui show BoxHeightStyle, BoxWidthStyle, Color;
@@ -4998,11 +5003,9 @@ void main() {
 
   group('Text selection toolbar', () {
     testWidgets('Collapsed selection works', (WidgetTester tester) async {
-      tester.view.physicalSize = const Size(400, 400);
-      tester.view.devicePixelRatio = 1;
-      addTearDown(tester.view.reset);
-
       EditableText.debugDeterministicCursor = true;
+      tester.binding.window.physicalSizeTestValue = const Size(400, 400);
+      tester.binding.window.devicePixelRatioTestValue = 1;
       TextEditingController controller;
       EditableTextState state;
       Offset bottomLeftSelectionPosition;
@@ -5180,14 +5183,15 @@ void main() {
           ),
         ),
       );
+
+      tester.binding.window.clearPhysicalSizeTestValue();
+      tester.binding.window.clearDevicePixelRatioTestValue();
     });
 
     testWidgets('selecting multiple words works', (WidgetTester tester) async {
-      tester.view.physicalSize = const Size(400, 400);
-      tester.view.devicePixelRatio = 1;
-      addTearDown(tester.view.reset);
-
       EditableText.debugDeterministicCursor = true;
+      tester.binding.window.physicalSizeTestValue = const Size(400, 400);
+      tester.binding.window.devicePixelRatioTestValue = 1;
       final TextEditingController controller;
       final EditableTextState state;
 
@@ -5249,14 +5253,15 @@ void main() {
           ),
         ),
       );
+
+      tester.binding.window.clearPhysicalSizeTestValue();
+      tester.binding.window.clearDevicePixelRatioTestValue();
     });
 
     testWidgets('selecting multiline works', (WidgetTester tester) async {
-      tester.view.physicalSize = const Size(400, 400);
-      tester.view.devicePixelRatio = 1;
-      addTearDown(tester.view.reset);
-
       EditableText.debugDeterministicCursor = true;
+      tester.binding.window.physicalSizeTestValue = const Size(400, 400);
+      tester.binding.window.devicePixelRatioTestValue = 1;
       final TextEditingController controller;
       final EditableTextState state;
 
@@ -5322,6 +5327,9 @@ void main() {
           ),
         ),
       );
+
+      tester.binding.window.clearPhysicalSizeTestValue();
+      tester.binding.window.clearDevicePixelRatioTestValue();
     });
 
     // This is a regression test for

packages/flutter/test/cupertino/text_selection_test.dart

@@ -246,8 +246,8 @@ void main() {
 
     testWidgets("When a menu item doesn't fit, a second page is used.", (WidgetTester tester) async {
       // Set the screen size to more narrow, so that Paste can't fit.
-      tester.view.physicalSize = const Size(800, 800);
-      addTearDown(tester.view.reset);
+      tester.binding.window.physicalSizeTestValue = const Size(800, 800);
+      addTearDown(tester.binding.window.clearPhysicalSizeTestValue);
 
       final TextEditingController controller = TextEditingController(text: 'abc def ghi');
       await tester.pumpWidget(CupertinoApp(
@@ -318,8 +318,8 @@ void main() {
     testWidgets('A smaller menu puts each button on its own page.', (WidgetTester tester) async {
       // Set the screen size to more narrow, so that two buttons can't fit on
       // the same page.
-      tester.view.physicalSize = const Size(640, 800);
-      addTearDown(tester.view.reset);
+      tester.binding.window.physicalSizeTestValue = const Size(640, 800);
+      addTearDown(tester.binding.window.clearPhysicalSizeTestValue);
 
       final TextEditingController controller = TextEditingController(text: 'abc def ghi');
       await tester.pumpWidget(CupertinoApp(

packages/flutter/test/cupertino/text_selection_toolbar_test.dart

@@ -188,8 +188,8 @@ void main() {
 
   testWidgets('does not paginate if children fit with zero margin', (WidgetTester tester) async {
     final List<Widget> children = List<Widget>.generate(7, (int i) => const TestBox());
-    final double spacerWidth = 1.0 / tester.view.devicePixelRatio;
-    final double dividerWidth = 1.0 / tester.view.devicePixelRatio;
+    final double spacerWidth = 1.0 / tester.binding.window.devicePixelRatio;
+    final double dividerWidth = 1.0 / tester.binding.window.devicePixelRatio;
     const double borderRadius = 8.0; // Should match _kToolbarBorderRadius
     final double width = 7 * TestBox.itemWidth + 6 * (dividerWidth + 2 * spacerWidth) + 2 * borderRadius;
     await tester.pumpWidget(

packages/flutter/test/gestures/gesture_binding_resample_event_on_widget_test.dart

@@ -101,25 +101,25 @@ void main() {
     expect(events.length, 1);
     expect(events[0], isA<PointerDownEvent>());
     expect(events[0].timeStamp, currentTestFrameTime() + kSamplingOffset);
-    expect(events[0].position, Offset(7.5 / tester.view.devicePixelRatio, 0.0));
+    expect(events[0].position, Offset(7.5 / GestureBinding.instance.window.devicePixelRatio, 0.0));
 
     // Now the system time is epoch + 20ms
     requestFrame();
     await tester.pump(const Duration(milliseconds: 10));
     expect(events.length, 2);
     expect(events[1].timeStamp, currentTestFrameTime() + kSamplingOffset);
     expect(events[1], isA<PointerMoveEvent>());
-    expect(events[1].position, Offset(22.5 / tester.view.devicePixelRatio, 0.0));
-    expect(events[1].delta, Offset(15.0 / tester.view.devicePixelRatio, 0.0));
+    expect(events[1].position, Offset(22.5 / GestureBinding.instance.window.devicePixelRatio, 0.0));
+    expect(events[1].delta, Offset(15.0 / GestureBinding.instance.window.devicePixelRatio, 0.0));
 
     // Now the system time is epoch + 30ms
     requestFrame();
     await tester.pump(const Duration(milliseconds: 10));
     expect(events.length, 4);
     expect(events[2].timeStamp, currentTestFrameTime() + kSamplingOffset);
     expect(events[2], isA<PointerMoveEvent>());
-    expect(events[2].position, Offset(37.5 / tester.view.devicePixelRatio, 0.0));
-    expect(events[2].delta, Offset(15.0 / tester.view.devicePixelRatio, 0.0));
+    expect(events[2].position, Offset(37.5 / GestureBinding.instance.window.devicePixelRatio, 0.0));
+    expect(events[2].delta, Offset(15.0 / GestureBinding.instance.window.devicePixelRatio, 0.0));
     expect(events[3].timeStamp, currentTestFrameTime() + kSamplingOffset);
     expect(events[3], isA<PointerUpEvent>());
   });

packages/flutter/test/gestures/gesture_binding_test.dart

@@ -162,8 +162,6 @@ void main() {
     expect(events[1], isA<PointerCancelEvent>());
   });
 
-  const double devicePixelRatio = 2.5;
-
   test('Can expand add and hover pointers', () {
     const ui.PointerDataPacket packet = ui.PointerDataPacket(
       data: <ui.PointerData>[
@@ -175,7 +173,7 @@ void main() {
       ],
     );
 
-    final List<PointerEvent> events = PointerEventConverter.expand(packet.data, devicePixelRatio).toList();
+    final List<PointerEvent> events = PointerEventConverter.expand(packet.data, GestureBinding.instance.window.devicePixelRatio).toList();
 
     expect(events.length, 5);
     expect(events[0], isA<PointerAddedEvent>());
@@ -191,7 +189,7 @@ void main() {
         ui.PointerData(change: ui.PointerChange.add, device: 24),
       ],
     );
-    List<PointerEvent> events = PointerEventConverter.expand(packet.data, devicePixelRatio).toList();
+    List<PointerEvent> events = PointerEventConverter.expand(packet.data, GestureBinding.instance.window.devicePixelRatio).toList();
 
     expect(events.length, 1);
     expect(events[0], isA<PointerAddedEvent>());
@@ -207,7 +205,7 @@ void main() {
         ui.PointerData(signalKind: ui.PointerSignalKind.scroll, device: 24, scrollDeltaY: double.negativeInfinity, scrollDeltaX: 10),
       ],
     );
-    events = PointerEventConverter.expand(packet.data, devicePixelRatio).toList();
+    events = PointerEventConverter.expand(packet.data, GestureBinding.instance.window.devicePixelRatio).toList();
     expect(events.length, 0);
 
     // Send packet with a valid scroll event.
@@ -217,7 +215,7 @@ void main() {
       ],
     );
     // Make sure PointerEventConverter can expand when device pixel ratio is valid.
-    events = PointerEventConverter.expand(packet.data, devicePixelRatio).toList();
+    events = PointerEventConverter.expand(packet.data, GestureBinding.instance.window.devicePixelRatio).toList();
     expect(events.length, 1);
     expect(events[0], isA<PointerScrollEvent>());
 
@@ -234,15 +232,15 @@ void main() {
         ],
     );
 
-    final List<PointerEvent> events = PointerEventConverter.expand(packet.data, devicePixelRatio).toList();
+    final List<PointerEvent> events = PointerEventConverter.expand(packet.data, GestureBinding.instance.window.devicePixelRatio).toList();
 
     expect(events.length, 2);
     expect(events[0], isA<PointerAddedEvent>());
     expect(events[1], isA<PointerScrollEvent>());
   });
 
   test('Should synthesize kPrimaryButton for touch when no button is set', () {
-    final Offset location = const Offset(10.0, 10.0) * devicePixelRatio;
+    final Offset location = const Offset(10.0, 10.0) * GestureBinding.instance.window.devicePixelRatio;
     final ui.PointerDataPacket packet = ui.PointerDataPacket(
       data: <ui.PointerData>[
         ui.PointerData(change: ui.PointerChange.add, physicalX: location.dx, physicalY: location.dy),
@@ -253,7 +251,7 @@ void main() {
       ],
     );
 
-    final List<PointerEvent> events = PointerEventConverter.expand(packet.data, devicePixelRatio).toList();
+    final List<PointerEvent> events = PointerEventConverter.expand(packet.data, GestureBinding.instance.window.devicePixelRatio).toList();
 
     expect(events.length, 5);
     expect(events[0], isA<PointerAddedEvent>());
@@ -269,7 +267,7 @@ void main() {
   });
 
   test('Should not synthesize kPrimaryButton for touch when a button is set', () {
-    final Offset location = const Offset(10.0, 10.0) * devicePixelRatio;
+    final Offset location = const Offset(10.0, 10.0) * GestureBinding.instance.window.devicePixelRatio;
     final ui.PointerDataPacket packet = ui.PointerDataPacket(
       data: <ui.PointerData>[
         ui.PointerData(change: ui.PointerChange.add, physicalX: location.dx, physicalY: location.dy),
@@ -280,7 +278,7 @@ void main() {
       ],
     );
 
-    final List<PointerEvent> events = PointerEventConverter.expand(packet.data, devicePixelRatio).toList();
+    final List<PointerEvent> events = PointerEventConverter.expand(packet.data, GestureBinding.instance.window.devicePixelRatio).toList();
 
     expect(events.length, 5);
     expect(events[0], isA<PointerAddedEvent>());
@@ -296,7 +294,7 @@ void main() {
   });
 
   test('Should synthesize kPrimaryButton for stylus when no button is set', () {
-    final Offset location = const Offset(10.0, 10.0) * devicePixelRatio;
+    final Offset location = const Offset(10.0, 10.0) * GestureBinding.instance.window.devicePixelRatio;
     for (final PointerDeviceKind kind in <PointerDeviceKind>[
       PointerDeviceKind.stylus,
       PointerDeviceKind.invertedStylus,
@@ -312,7 +310,7 @@ void main() {
         ],
       );
 
-      final List<PointerEvent> events = PointerEventConverter.expand(packet.data, devicePixelRatio).toList();
+      final List<PointerEvent> events = PointerEventConverter.expand(packet.data, GestureBinding.instance.window.devicePixelRatio).toList();
 
       expect(events.length, 5);
       expect(events[0], isA<PointerAddedEvent>());
@@ -329,7 +327,7 @@ void main() {
   });
 
   test('Should synthesize kPrimaryButton for unknown devices when no button is set', () {
-    final Offset location = const Offset(10.0, 10.0) * devicePixelRatio;
+    final Offset location = const Offset(10.0, 10.0) * GestureBinding.instance.window.devicePixelRatio;
     const PointerDeviceKind kind = PointerDeviceKind.unknown;
     final ui.PointerDataPacket packet = ui.PointerDataPacket(
       data: <ui.PointerData>[
@@ -341,7 +339,7 @@ void main() {
       ],
     );
 
-    final List<PointerEvent> events = PointerEventConverter.expand(packet.data, devicePixelRatio).toList();
+    final List<PointerEvent> events = PointerEventConverter.expand(packet.data, GestureBinding.instance.window.devicePixelRatio).toList();
 
     expect(events.length, 5);
     expect(events[0], isA<PointerAddedEvent>());
@@ -357,7 +355,7 @@ void main() {
   });
 
   test('Should not synthesize kPrimaryButton for mouse', () {
-    final Offset location = const Offset(10.0, 10.0) * devicePixelRatio;
+    final Offset location = const Offset(10.0, 10.0) * GestureBinding.instance.window.devicePixelRatio;
     for (final PointerDeviceKind kind in <PointerDeviceKind>[
       PointerDeviceKind.mouse,
     ]) {
@@ -371,7 +369,7 @@ void main() {
         ],
       );
 
-      final List<PointerEvent> events = PointerEventConverter.expand(packet.data, devicePixelRatio).toList();
+      final List<PointerEvent> events = PointerEventConverter.expand(packet.data, GestureBinding.instance.window.devicePixelRatio).toList();
 
       expect(events.length, 5);
       expect(events[0], isA<PointerAddedEvent>());