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

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

Index: chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h
diff --git a/chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h b/chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h
index 3bfd7c704711e7a7824858caa47aee4069e3ee04..ae74a73a752a90d416c7cf494b0c07c5f2959467 100644
--- a/chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h
+++ b/chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h
@@ -65,10 +65,6 @@ enum class DialogViewID : int {
   // 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,
@@ -81,6 +77,14 @@ enum class DialogViewID : int {
 
   // 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,

[anthonyvd, 2017/05/19 21:27:01]

This and the following offset overlap. You probably want to set the next one
explicitly.

[Mathieu, 2017/05/20 01:20:25]

Done.

+  // Used to label the error labels with an offset, which gets added to
+  // the Autofill type value they represent.
+  ERROR_LABEL_OFFSET,
 };
 
 }  // namespace payments