[Payment Request] Fixes modally presented editors

ios/chrome/browser/ui/payments/contact_info_edit_coordinator_unittest.mm

Index: ios/chrome/browser/ui/payments/contact_info_edit_coordinator_unittest.mm
diff --git a/ios/chrome/browser/ui/payments/contact_info_edit_coordinator_unittest.mm b/ios/chrome/browser/ui/payments/contact_info_edit_coordinator_unittest.mm
index 6522712b43344d322ede0aac8ee3deb6f40175fa..22441829b340050197619176a2cebd4b26d1c307 100644
--- a/ios/chrome/browser/ui/payments/contact_info_edit_coordinator_unittest.mm
+++ b/ios/chrome/browser/ui/payments/contact_info_edit_coordinator_unittest.mm
@@ -135,6 +135,11 @@ TEST_F(PaymentRequestContactInfoEditCoordinatorTest, StartAndStop) {
   // Spin the run loop to trigger the animation.
   base::test::ios::SpinRunLoopWithMaxDelay(base::TimeDelta::FromSecondsD(1.0));
   EXPECT_TRUE([base_view_controller.presentedViewController
+      isMemberOfClass:[UINavigationController class]]);
+  UINavigationController* navigation_controller =
+      base::mac::ObjCCastStrict<UINavigationController>(
+          base_view_controller.presentedViewController);
+  EXPECT_TRUE([navigation_controller.visibleViewController
       isMemberOfClass:[PaymentRequestEditViewController class]]);
 
   [coordinator stop];
@@ -192,9 +197,14 @@ TEST_F(PaymentRequestContactInfoEditCoordinatorTest, DidFinishCreating) {
   EXPECT_CALL(*profile_comparator_, Invalidate(_)).Times(0);
 
   // Call the controller delegate method.
+  EXPECT_TRUE([base_view_controller.presentedViewController
+      isMemberOfClass:[UINavigationController class]]);
+  UINavigationController* navigation_controller =
+      base::mac::ObjCCastStrict<UINavigationController>(
+          base_view_controller.presentedViewController);
   PaymentRequestEditViewController* view_controller =
       base::mac::ObjCCastStrict<PaymentRequestEditViewController>(
-          base_view_controller.presentedViewController);
+          navigation_controller.visibleViewController);
   [coordinator paymentRequestEditViewController:view_controller
                          didFinishEditingFields:GetEditorFields()];
 
@@ -251,9 +261,14 @@ TEST_F(PaymentRequestContactInfoEditCoordinatorTest, DidFinishEditing) {
       .Times(1);
 
   // Call the controller delegate method.
+  EXPECT_TRUE([base_view_controller.presentedViewController
+      isMemberOfClass:[UINavigationController class]]);
+  UINavigationController* navigation_controller =
+      base::mac::ObjCCastStrict<UINavigationController>(
+          base_view_controller.presentedViewController);
   PaymentRequestEditViewController* view_controller =
       base::mac::ObjCCastStrict<PaymentRequestEditViewController>(
-          base_view_controller.presentedViewController);
+          navigation_controller.visibleViewController);
   [coordinator paymentRequestEditViewController:view_controller
                          didFinishEditingFields:GetEditorFields()];
 
@@ -286,9 +301,14 @@ TEST_F(PaymentRequestContactInfoEditCoordinatorTest, DidCancel) {
   EXPECT_NE(nil, base_view_controller.presentedViewController);
 
   // Call the controller delegate method.
+  EXPECT_TRUE([base_view_controller.presentedViewController
+      isMemberOfClass:[UINavigationController class]]);
+  UINavigationController* navigation_controller =
+      base::mac::ObjCCastStrict<UINavigationController>(
+          base_view_controller.presentedViewController);
   PaymentRequestEditViewController* view_controller =
       base::mac::ObjCCastStrict<PaymentRequestEditViewController>(
-          base_view_controller.presentedViewController);
+          navigation_controller.visibleViewController);
   [coordinator paymentRequestEditViewControllerDidCancel:view_controller];
 
   EXPECT_OCMOCK_VERIFY(delegate);