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

chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_REQUEST_DIALOG_VIEW_IDS_H_
 #define CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_REQUEST_DIALOG_VIEW_IDS_H_
 
 #include "components/autofill/core/browser/field_types.h"
 
 // This defines an enumeration of IDs that can uniquely identify a view within
@@ skipping 47 matching lines @@
 
   // The following are views contained within the Payment Method Sheet.
   CONTACT_INFO_SHEET_LIST_VIEW,
   PAYMENT_METHOD_SHEET_LIST_VIEW,
   SHIPPING_ADDRESS_SHEET_LIST_VIEW,
 
   // Used in selectable rows. Each row in a view reuses this ID, but the ID is
   // unique at the scope of the parent row.
   CHECKMARK_VIEW,
 
-  // Used to label the error labels with an offset, which gets added to
-  // the Autofill type value they represent (for tests).
-  ERROR_LABEL_OFFSET,
-
   // The CVC text field in the unmask sheet.
   CVC_PROMPT_TEXT_FIELD,
   CVC_ERROR_LABEL,
 
   // The following are the ids for the individual sheets.
   CONTACT_INFO_EDITOR_SHEET,
   CREDIT_CARD_EDITOR_SHEET,
   CVC_UNMASK_SHEET,
   SHIPPING_ADDRESS_EDITOR_SHEET,
 
   // The combobox to choose a billing address to associate to a credit card.
   CREDIT_CARD_BILLING_ADDRESS,
+
+  // NOTE: Keep these values last.
+  // Used to offset the IDs of input fields, which gets added to the Autofill
+  // type value they represent.
+  INPUT_FIELD_TYPE_OFFSET,
+  // Used to label the error labels with an offset, which gets added to
+  // the Autofill type value they represent.
+  ERROR_LABEL_OFFSET = 2 * INPUT_FIELD_TYPE_OFFSET,

[anthonyvd, 2017/05/22 13:18:17]

Can this be INPUT_FIELD_TYPE_OFFSET + autofill::MAX_VALID_FIELD_TYPE, making the
range guaranteed to be long enough?

[Mathieu, 2017/05/22 16:30:40]

Done.

 };
 
 }  // namespace payments
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PAYMENTS_PAYMENT_REQUEST_DIALOG_VIEW_IDS_H_