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

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

 // 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.
 
 #include "chrome/browser/ui/views/payments/contact_info_editor_view_controller.h"
 
 #include <utility>
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/payments/validating_textfield.h"
@@ skipping 143 matching lines @@
 
 bool ContactInfoEditorViewController::ContactInfoValidationDelegate::
     IsValidTextfield(views::Textfield* textfield) {
   return ValidateTextfield(textfield, nullptr);
 }
 
 bool ContactInfoEditorViewController::ContactInfoValidationDelegate::
     TextfieldValueChanged(views::Textfield* textfield) {
   base::string16 error_message;
   bool is_valid = ValidateTextfield(textfield, &error_message);
-  controller_->DisplayErrorMessageForField(field_, error_message);
+  controller_->DisplayErrorMessageForField(field_.type, error_message);
   return is_valid;
 }
 
 bool ContactInfoEditorViewController::ContactInfoValidationDelegate::
     ValidateTextfield(views::Textfield* textfield,
                       base::string16* error_message) {
   bool is_valid = true;
 
   if (textfield->text().empty()) {
     is_valid = false;
@@ skipping 52 matching lines @@
 }
 
 bool ContactInfoEditorViewController::ContactInfoValidationDelegate::
     ComboboxValueChanged(views::Combobox* combobox) {
   // This UI doesn't contain any comboboxes.
   NOTREACHED();
   return true;
 }
 
 }  // namespace payments