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

chrome/browser/ui/views/payments/credit_card_editor_view_controller_browsertest.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 <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
+#include "chrome/browser/ui/views/payments/editor_view_controller.h"
 #include "chrome/browser/ui/views/payments/payment_request_browsertest_base.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view_ids.h"
 #include "chrome/browser/ui/views/payments/validating_textfield.h"
 #include "components/autofill/core/browser/autofill_test_utils.h"
 #include "components/autofill/core/browser/field_types.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/autofill/core/browser/test_autofill_clock.h"
 #include "components/payments/content/payment_request.h"
 #include "components/payments/content/payment_request_spec.h"
 #include "components/strings/grit/components_strings.h"
@@ skipping 162 matching lines @@
                           autofill::CREDIT_CARD_NUMBER);
   // The card is expired.
   SetComboboxValue(base::ASCIIToUTF16("01"), autofill::CREDIT_CARD_EXP_MONTH);
   SetComboboxValue(base::ASCIIToUTF16("2017"),
                    autofill::CREDIT_CARD_EXP_4_DIGIT_YEAR);
 
   ClickOnDialogViewAndWait(DialogViewID::EDITOR_SAVE_BUTTON);
 
   EXPECT_FALSE(IsEditorTextfieldInvalid(autofill::CREDIT_CARD_NAME_FULL));
   EXPECT_FALSE(IsEditorTextfieldInvalid(autofill::CREDIT_CARD_NUMBER));
-  // TODO(mathp): Both expiration fields should be marked as invalid when the
-  // card is expired.
-  EXPECT_FALSE(IsEditorComboboxInvalid(autofill::CREDIT_CARD_EXP_MONTH));
-  EXPECT_FALSE(IsEditorComboboxInvalid(autofill::CREDIT_CARD_EXP_4_DIGIT_YEAR));
+  EXPECT_TRUE(IsEditorComboboxInvalid(autofill::CREDIT_CARD_EXP_MONTH));
+  EXPECT_TRUE(IsEditorComboboxInvalid(autofill::CREDIT_CARD_EXP_4_DIGIT_YEAR));
+  EXPECT_EQ(l10n_util::GetStringUTF16(
+                IDS_PAYMENTS_VALIDATION_INVALID_CREDIT_CARD_EXPIRED),
+            GetErrorLabelForType(autofill::CREDIT_CARD_EXP_DATE_4_DIGIT_YEAR));
 
   autofill::PersonalDataManager* personal_data_manager = GetDataManager();
   EXPECT_EQ(0u, personal_data_manager->GetCreditCards().size());
 }
 
 IN_PROC_BROWSER_TEST_F(PaymentRequestCreditCardEditorTest,
                        EnteringNothingInARequiredField) {
   autofill::TestAutofillClock test_clock;
   test_clock.SetNow(kJune2017);
 
@@ skipping 313 matching lines @@
                           autofill::ADDRESS_HOME_ZIP);
   SetEditorTextfieldValue(base::ASCIIToUTF16("5755555555"),
                           autofill::PHONE_HOME_WHOLE_NUMBER);
 
   // Come back to credit card editor.
   ResetEventObserver(DialogEvent::BACK_NAVIGATION);
   ClickOnDialogViewAndWait(DialogViewID::SAVE_ADDRESS_BUTTON);
 
   // The billing address must be properly selected and valid.
   views::Combobox* billing_combobox = static_cast<views::Combobox*>(
-      dialog_view()->GetViewByID(autofill::ADDRESS_BILLING_LINE1));
+      dialog_view()->GetViewByID(EditorViewController::GetInputFieldViewId(
+          autofill::ADDRESS_BILLING_LINE1)));
   ASSERT_NE(nullptr, billing_combobox);
   EXPECT_FALSE(billing_combobox->invalid());
 
   // And then save credit card state and come back to payment sheet.
   ResetEventObserver(DialogEvent::BACK_TO_PAYMENT_SHEET_NAVIGATION);
 
   // Verifying the data is in the DB.
   autofill::PersonalDataManager* personal_data_manager = GetDataManager();
   personal_data_manager->AddObserver(&personal_data_observer_);
 
@@ skipping 47 matching lines @@
 IN_PROC_BROWSER_TEST_F(PaymentRequestCreditCardEditorTest, EnteringEmptyData) {
   InvokePaymentRequestUI();
 
   OpenCreditCardEditorScreen();
 
   // Setting empty data and unfocusing a required textfield will make it
   // invalid.
   SetEditorTextfieldValue(base::ASCIIToUTF16(""),
                           autofill::CREDIT_CARD_NAME_FULL);
 
-  ValidatingTextfield* textfield =
-      static_cast<ValidatingTextfield*>(dialog_view()->GetViewByID(
-          static_cast<int>(autofill::CREDIT_CARD_NAME_FULL)));
+  ValidatingTextfield* textfield = static_cast<ValidatingTextfield*>(
+      dialog_view()->GetViewByID(EditorViewController::GetInputFieldViewId(
+          autofill::CREDIT_CARD_NAME_FULL)));
   EXPECT_TRUE(textfield);
   EXPECT_TRUE(textfield->invalid());
 }
 
 }  // namespace payments