[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 "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/payments/validating_textfield.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_profile.h"
@@ skipping 176 matching lines @@
         break;
       }
 
       default: {
         NOTREACHED();
         break;
       }
     }
   }
 
-  controller_->DisplayErrorMessageForField(field_, error_message);
+  controller_->DisplayErrorMessageForField(field_.type, error_message);
   return is_valid;
 }
 
 bool ContactInfoEditorViewController::ContactInfoValidationDelegate::
     ValidateCombobox(views::Combobox* combobox) {
   // This UI doesn't contain any comboboxes.
   NOTREACHED();
   return true;
 }
 
 }  // namespace payments