[Payment Request] Fixes modally presented editors

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

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/chrome/browser/ui/payments/address_edit_coordinator.h"
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 126 matching lines @@
   AddressEditCoordinator* coordinator = [[AddressEditCoordinator alloc]
       initWithBaseViewController:base_view_controller];
   [coordinator setPaymentRequest:payment_request_.get()];
 
   EXPECT_EQ(nil, base_view_controller.presentedViewController);
 
   [coordinator start];
   // 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];
   // Wait until the animation completes and the presented view controller is
   // dismissed.
   base::test::ios::WaitUntilCondition(^bool() {
     return !base_view_controller.presentedViewController;
   });
   EXPECT_EQ(nil, base_view_controller.presentedViewController);
 }
@@ skipping 37 matching lines @@
   EXPECT_CALL(personal_data_manager_,
               AddProfile(ProfileMatches("John Doe", "CA" /* Canada */, "Quebec",
                                         "16502111111")))
       .Times(1);
   // No autofill profile should get updated in the PersonalDataManager.
   EXPECT_CALL(personal_data_manager_, UpdateProfile(_)).Times(0);
   // No autofill profile should get invalidated in PaymentsProfileComparator.
   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()];
 
   EXPECT_OCMOCK_VERIFY(delegate);
 }
 
 // Tests that calling the view controller delegate method which signals that the
 // user has finished editing an address, causes the the corresponding
 // coordinator delegate method to get called. The address should not get
 // re-added to the PaymentRequest instance or the PersonalDataManager. However,
@@ skipping 36 matching lines @@
               UpdateProfile(ProfileMatches("John Doe", "CA" /* Canada */,
                                            "Quebec", "16502111111")))
       .Times(1);
   // Expect an autofill profile to be invalidated in PaymentsProfileComparator.
   EXPECT_CALL(*profile_comparator_,
               Invalidate(ProfileMatches("John Doe", "CA" /* Canada */, "Quebec",
                                         "16502111111")))
       .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()];
 
   EXPECT_OCMOCK_VERIFY(delegate);
 }
 
 // Tests that calling the view controller delegate method which signals that the
 // user has chosen to cancel creating/editing an address, causes the
 // corresponding coordinator delegate method to get called.
 TEST_F(PaymentRequestAddressEditCoordinatorTest, DidCancel) {
@@ skipping 12 matching lines @@
   [coordinator setDelegate:delegate];
 
   EXPECT_EQ(nil, base_view_controller.presentedViewController);
 
   [coordinator start];
   // Spin the run loop to trigger the animation.
   base::test::ios::SpinRunLoopWithMaxDelay(base::TimeDelta::FromSecondsD(1.0));
   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);
 }