[Payment Request] Fixes modally presented editors

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

Index: ios/chrome/browser/ui/payments/credit_card_edit_coordinator_unittest.mm
diff --git a/ios/chrome/browser/ui/payments/credit_card_edit_coordinator_unittest.mm b/ios/chrome/browser/ui/payments/credit_card_edit_coordinator_unittest.mm
index fb0c5ab76322daad21b6a12b501838790e6ce47a..9016fd391649d9cd6be45f64a1661a37234ba4ba 100644
--- a/ios/chrome/browser/ui/payments/credit_card_edit_coordinator_unittest.mm
+++ b/ios/chrome/browser/ui/payments/credit_card_edit_coordinator_unittest.mm
@@ -131,6 +131,11 @@ TEST_F(PaymentRequestCreditCardEditCoordinatorTest, 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];
@@ -186,9 +191,14 @@ TEST_F(PaymentRequestCreditCardEditCoordinatorTest, DidFinishCreatingWithSave) {
   EXPECT_CALL(personal_data_manager_, UpdateCreditCard(_)).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(true)];
 
@@ -236,9 +246,14 @@ TEST_F(PaymentRequestCreditCardEditCoordinatorTest, DidFinishCreatingNoSave) {
   EXPECT_CALL(personal_data_manager_, UpdateCreditCard(_)).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(false)];
 
@@ -289,9 +304,14 @@ TEST_F(PaymentRequestCreditCardEditCoordinatorTest, 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(true)];
 
@@ -324,9 +344,14 @@ TEST_F(PaymentRequestCreditCardEditCoordinatorTest, 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);