[Payment Request] Refactors the edit view controller

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 527d77267b23678e1a32729d12034fcf2a573d51..267f819198554d3fbb6caa5f12e2e6f1875504be 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
@@ -63,22 +63,33 @@ MATCHER_P5(CreditCardMatches,
 NSArray<EditorField*>* GetEditorFields() {
   return @[
     [[EditorField alloc] initWithAutofillUIType:AutofillUITypeCreditCardNumber
+                                      fieldType:EditorFieldTypeTextField
                                           label:@"Credit Card Number"
                                           value:@"4111111111111111" /* Visa */
                                        required:YES],
     [[EditorField alloc]
         initWithAutofillUIType:AutofillUITypeCreditCardHolderFullName
+                     fieldType:EditorFieldTypeTextField
+

[macourteau, 2017/05/11 18:59:39]

nit: blank line?

[Moe, 2017/05/11 19:39:38]

Done.

                          label:@"Cardholder Name"
                          value:@"John Doe"
                       required:YES],
     [[EditorField alloc] initWithAutofillUIType:AutofillUITypeCreditCardExpMonth
+                                      fieldType:EditorFieldTypeTextField
                                           label:@"Expiration Month"
                                           value:@"12"
                                        required:YES],
     [[EditorField alloc] initWithAutofillUIType:AutofillUITypeCreditCardExpYear
+                                      fieldType:EditorFieldTypeTextField
                                           label:@"Expiration Year"
                                           value:@"2090"
                                        required:YES],
+    [[EditorField alloc]
+        initWithAutofillUIType:AutofillUITypeCreditCardBillingAddress
+                     fieldType:EditorFieldTypeSelector
+                         label:@"Billing Address"
+                         value:@"12345"
+                      required:YES],
   ];
 }
 
@@ -170,7 +181,6 @@ TEST_F(PaymentRequestCreditCardEditCoordinatorTest, DidFinishCreatingWithSave) {
           navigation_controller.visibleViewController);
   [coordinator creditCardEditViewController:view_controller
                      didFinishEditingFields:GetEditorFields()
-                           billingAddressID:@"12345"
                              saveCreditCard:YES];
 
   EXPECT_OCMOCK_VERIFY(delegate);
@@ -221,7 +231,6 @@ TEST_F(PaymentRequestCreditCardEditCoordinatorTest, DidFinishCreatingNoSave) {
           navigation_controller.visibleViewController);
   [coordinator creditCardEditViewController:view_controller
                      didFinishEditingFields:GetEditorFields()
-                           billingAddressID:@"12345"
                              saveCreditCard:NO];
 
   EXPECT_OCMOCK_VERIFY(delegate);
@@ -272,7 +281,6 @@ TEST_F(PaymentRequestCreditCardEditCoordinatorTest, DidFinishEditing) {
           navigation_controller.visibleViewController);
   [coordinator creditCardEditViewController:view_controller
                      didFinishEditingFields:GetEditorFields()
-                           billingAddressID:@"12345"
                              saveCreditCard:YES];
 
   EXPECT_OCMOCK_VERIFY(delegate);