From fd4221842c21cd32e9d9e7b6918bb7c146b8336d Mon Sep 17 00:00:00 2001
From: nilsreichardt <me@nils.re>
Date: Tue, 19 Sep 2023 16:58:01 +0200
Subject: [PATCH 1/4] [camera_android] Removes usage of `_ambiguate` method in
 tests

---
 packages/camera/camera_android/CHANGELOG.md   |  4 ++++
 .../test/android_camera_test.dart             | 23 +++++++------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/packages/camera/camera_android/CHANGELOG.md b/packages/camera/camera_android/CHANGELOG.md
index b0c7ec25bf11..e566235b263c 100644
--- a/packages/camera/camera_android/CHANGELOG.md
+++ b/packages/camera/camera_android/CHANGELOG.md
@@ -1,3 +1,7 @@
+## NEXT
+
+* Removes usage of `_ambiguate` method in tests.
+
 ## 0.10.8+9
 
 * Removes usage of `_ambiguate` method in example.
diff --git a/packages/camera/camera_android/test/android_camera_test.dart b/packages/camera/camera_android/test/android_camera_test.dart
index 8c811403304d..91c79fd1e1d4 100644
--- a/packages/camera/camera_android/test/android_camera_test.dart
+++ b/packages/camera/camera_android/test/android_camera_test.dart
@@ -32,15 +32,14 @@ void main() {
     // registerWith is called very early in initialization the bindings won't
     // have been initialized. While registerWith could intialize them, that
     // could slow down startup, so instead the handler should be set up lazily.
-    final ByteData? response =
-        await _ambiguate(TestDefaultBinaryMessengerBinding.instance)!
-            .defaultBinaryMessenger
-            .handlePlatformMessage(
-                AndroidCamera.deviceEventChannelName,
-                const StandardMethodCodec().encodeMethodCall(const MethodCall(
-                    'orientation_changed',
-                    <String, Object>{'orientation': 'portraitDown'})),
-                (ByteData? data) {});
+    final ByteData? response = await TestDefaultBinaryMessengerBinding
+        .instance.defaultBinaryMessenger
+        .handlePlatformMessage(
+            AndroidCamera.deviceEventChannelName,
+            const StandardMethodCodec().encodeMethodCall(const MethodCall(
+                'orientation_changed',
+                <String, Object>{'orientation': 'portraitDown'})),
+            (ByteData? data) {});
     expect(response, null);
   });
 
@@ -1146,9 +1145,3 @@ void main() {
     });
   });
 }
-
-/// This allows a value of type T or T? to be treated as a value of type T?.
-///
-/// We use this so that APIs that have become non-nullable can still be used
-/// with `!` and `?` on the stable branch.
-T? _ambiguate<T>(T? value) => value;

From 8a46da75a0831fa22051cc605ac6078ef3ec8003 Mon Sep 17 00:00:00 2001
From: nilsreichardt <me@nils.re>
Date: Tue, 19 Sep 2023 16:58:34 +0200
Subject: [PATCH 2/4] Also fix usage

---
 packages/camera/camera_android/test/android_camera_test.dart | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/camera/camera_android/test/android_camera_test.dart b/packages/camera/camera_android/test/android_camera_test.dart
index 91c79fd1e1d4..fb6f6a71639a 100644
--- a/packages/camera/camera_android/test/android_camera_test.dart
+++ b/packages/camera/camera_android/test/android_camera_test.dart
@@ -421,8 +421,7 @@ void main() {
       const DeviceOrientationChangedEvent event =
           DeviceOrientationChangedEvent(DeviceOrientation.portraitUp);
       for (int i = 0; i < 3; i++) {
-        await _ambiguate(TestDefaultBinaryMessengerBinding.instance)!
-            .defaultBinaryMessenger
+        await TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
             .handlePlatformMessage(
                 AndroidCamera.deviceEventChannelName,
                 const StandardMethodCodec().encodeMethodCall(

From 91cb3f09a3e81b375d9e3116e9863a95292deebe Mon Sep 17 00:00:00 2001
From: nilsreichardt <me@nils.re>
Date: Tue, 19 Sep 2023 17:02:36 +0200
Subject: [PATCH 3/4] Add file

---
 .../camera/camera_android/test/method_channel_mock.dart  | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/packages/camera/camera_android/test/method_channel_mock.dart b/packages/camera/camera_android/test/method_channel_mock.dart
index f26d12a3688a..a7362d0e0496 100644
--- a/packages/camera/camera_android/test/method_channel_mock.dart
+++ b/packages/camera/camera_android/test/method_channel_mock.dart
@@ -11,8 +11,7 @@ class MethodChannelMock {
     this.delay,
     required this.methods,
   }) : methodChannel = MethodChannel(channelName) {
-    _ambiguate(TestDefaultBinaryMessengerBinding.instance)!
-        .defaultBinaryMessenger
+    TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
         .setMockMethodCallHandler(methodChannel, _handler);
   }
 
@@ -39,9 +38,3 @@ class MethodChannelMock {
     });
   }
 }
-
-/// This allows a value of type T or T? to be treated as a value of type T?.
-///
-/// We use this so that APIs that have become non-nullable can still be used
-/// with `!` and `?` on the stable branch.
-T? _ambiguate<T>(T? value) => value;

From be0a16ed971678740fe28c61cc51f0d92be75dea Mon Sep 17 00:00:00 2001
From: nilsreichardt <me@nils.re>
Date: Fri, 22 Sep 2023 21:46:36 +0200
Subject: [PATCH 4/4] Remove changelog

---
 packages/camera/camera_android/CHANGELOG.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/camera/camera_android/CHANGELOG.md b/packages/camera/camera_android/CHANGELOG.md
index e566235b263c..b0c7ec25bf11 100644
--- a/packages/camera/camera_android/CHANGELOG.md
+++ b/packages/camera/camera_android/CHANGELOG.md
@@ -1,7 +1,3 @@
-## NEXT
-
-* Removes usage of `_ambiguate` method in tests.
-
 ## 0.10.8+9
 
 * Removes usage of `_ambiguate` method in example.