[Payments] Have expiration date be on the same line in CC editor

chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc

Index: chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc
diff --git a/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc b/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc
index 486e308e03f624cd9a3e1f60c89a31570b161647..0f692bf61fe10be0130995dbaaec4b977bcc4e93 100644
--- a/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc
+++ b/chrome/browser/ui/views/payments/shipping_address_editor_view_controller.cc
@@ -495,12 +495,13 @@ bool ShippingAddressEditorViewController::ShippingAddressValidationDelegate::
             value, controller_->countries_[controller_->chosen_country_index_]
                        .first)) {
       controller_->DisplayErrorMessageForField(
-          field_, l10n_util::GetStringUTF16(
-                      IDS_PAYMENTS_PHONE_INVALID_VALIDATION_MESSAGE));
+          field_.type, l10n_util::GetStringUTF16(
+                           IDS_PAYMENTS_PHONE_INVALID_VALIDATION_MESSAGE));
       return false;
     }
     // As long as other field types are non-empty, they are valid.
-    controller_->DisplayErrorMessageForField(field_, base::ASCIIToUTF16(""));
+    controller_->DisplayErrorMessageForField(field_.type,
+                                             base::ASCIIToUTF16(""));
     return true;
   }
   bool is_required_valid = !field_.required;
@@ -508,7 +509,7 @@ bool ShippingAddressEditorViewController::ShippingAddressValidationDelegate::
       is_required_valid ? base::ASCIIToUTF16("")
                         : l10n_util::GetStringUTF16(
                               IDS_PAYMENTS_FIELD_REQUIRED_VALIDATION_MESSAGE);
-  controller_->DisplayErrorMessageForField(field_, displayed_message);
+  controller_->DisplayErrorMessageForField(field_.type, displayed_message);
   return is_required_valid;
 }