[Payment Request] Fixes modally presented editors

ios/chrome/browser/ui/payments/contact_info_edit_coordinator.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/contact_info_edit_coordinator.h"
 
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/autofill/core/browser/autofill_country.h"
@@ skipping 13 matching lines @@
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 namespace {
 using ::AutofillTypeFromAutofillUIType;
 }  // namespace
 
 @interface ContactInfoEditCoordinator ()
 
-@property(nonatomic, strong) PaymentRequestEditViewController* viewController;
+@property(nonatomic, strong) UINavigationController* viewController;
+
+@property(nonatomic, strong)
+    PaymentRequestEditViewController* editViewController;
 
 @property(nonatomic, strong) ContactInfoEditMediator* mediator;
 
 @end
 
 @implementation ContactInfoEditCoordinator
 
 @synthesize profile = _profile;
 @synthesize paymentRequest = _paymentRequest;
 @synthesize delegate = _delegate;
 @synthesize viewController = _viewController;
+@synthesize editViewController = _editViewController;
 @synthesize mediator = _mediator;
 
 - (void)start {
-  self.viewController = [[PaymentRequestEditViewController alloc] init];
+  self.editViewController = [[PaymentRequestEditViewController alloc] init];
   // TODO(crbug.com/602666): Title varies depending on what field is missing.
   // e.g., Add Email vs. Add Phone Number.
   NSString* title =
       self.profile
           ? l10n_util::GetNSString(IDS_PAYMENTS_EDIT_CONTACT_DETAILS_LABEL)
           : l10n_util::GetNSString(IDS_PAYMENTS_ADD_CONTACT_DETAILS_LABEL);
-  [self.viewController setTitle:title];
-  [self.viewController setDelegate:self];
-  [self.viewController setValidatorDelegate:self];
+  [self.editViewController setTitle:title];
+  [self.editViewController setDelegate:self];
+  [self.editViewController setValidatorDelegate:self];
   self.mediator = [[ContactInfoEditMediator alloc]
       initWithPaymentRequest:self.paymentRequest
                      profile:self.profile];
-  [self.mediator setConsumer:self.viewController];
-  [self.viewController setDataSource:self.mediator];
-  [self.viewController loadModel];
+  [self.mediator setConsumer:self.editViewController];
+  [self.editViewController setDataSource:self.mediator];
+  [self.editViewController loadModel];
+
+  self.viewController = [[UINavigationController alloc]
+      initWithRootViewController:self.editViewController];
+  [self.viewController setModalPresentationStyle:UIModalPresentationFormSheet];
+  [self.viewController
+      setModalTransitionStyle:UIModalTransitionStyleCoverVertical];
+  [self.viewController setNavigationBarHidden:YES];
 
   [[self baseViewController] presentViewController:self.viewController
                                           animated:YES
                                         completion:nil];
 }
 
 - (void)stop {
   [[self.viewController presentingViewController]
       dismissViewControllerAnimated:YES
                          completion:nil];
+  self.editViewController = nil;
   self.viewController = nil;
 }
 
 #pragma mark - PaymentRequestEditViewControllerValidator
 
 - (NSString*)paymentRequestEditViewController:
                  (PaymentRequestEditViewController*)controller
                                 validateField:(EditorField*)field {
   if (field.value.length) {
     switch (field.autofillUIType) {
@@ skipping 63 matching lines @@
   [self.delegate contactInfoEditCoordinator:self
                     didFinishEditingProfile:self.profile];
 }
 
 - (void)paymentRequestEditViewControllerDidCancel:
     (PaymentRequestEditViewController*)controller {
   [self.delegate contactInfoEditCoordinatorDidCancel:self];
 }
 
 @end