[Payments] Improve some accessibility labels in editors

BUG=729633
TEST=VoiceOver

Review-Url: https://codereview.chromium.org/2931503002
Cr-Commit-Position: refs/heads/master@{#478600}

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

@@ -283,10 +283,11 @@ CreditCardEditorViewController::CreateCustomFieldView(
 
     combobox_layout->StartRow(0, 0);
     constexpr int kInputFieldHeight = 28;
-    EditorField tmp_month{autofill::CREDIT_CARD_EXP_MONTH, base::string16(),
-                          EditorField::LengthHint::HINT_SHORT,
-                          /*required=*/true,
-                          EditorField::ControlType::COMBOBOX};
+    EditorField tmp_month{
+        autofill::CREDIT_CARD_EXP_MONTH,
+        l10n_util::GetStringUTF16(IDS_AUTOFILL_FIELD_LABEL_EXPIRATION_MONTH),
+        EditorField::LengthHint::HINT_SHORT,
+        /*required=*/true, EditorField::ControlType::COMBOBOX};
     std::unique_ptr<ValidatingCombobox> month_combobox =
         CreateComboboxForField(tmp_month);
     *focusable_field = month_combobox.get();
@@ -294,9 +295,11 @@ CreditCardEditorViewController::CreateCustomFieldView(
                              views::GridLayout::FILL, views::GridLayout::FILL,
                              0, kInputFieldHeight);
 
-    EditorField tmp_year{autofill::CREDIT_CARD_EXP_4_DIGIT_YEAR,
-                         base::string16(), EditorField::LengthHint::HINT_SHORT,
-                         /*required=*/true, EditorField::ControlType::COMBOBOX};
+    EditorField tmp_year{
+        autofill::CREDIT_CARD_EXP_4_DIGIT_YEAR,
+        l10n_util::GetStringUTF16(IDS_AUTOFILL_FIELD_LABEL_EXPIRATION_YEAR),
+        EditorField::LengthHint::HINT_SHORT,
+        /*required=*/true, EditorField::ControlType::COMBOBOX};
     std::unique_ptr<ValidatingCombobox> year_combobox =
         CreateComboboxForField(tmp_year);
     combobox_layout->AddView(year_combobox.release(), 1, 1,

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

@@ -206,6 +206,7 @@ EditorViewController::CreateComboboxForField(const EditorField& field) {
       base::MakeUnique<ValidatingCombobox>(GetComboboxModelForType(field.type),
                                            CreateValidationDelegate(field));
   base::string16 initial_value = GetInitialValueForType(field.type);
+  combobox->SetAccessibleName(field.label);
   if (!initial_value.empty()) {
     combobox->SelectValue(initial_value);
     combobox->SetInvalid(!combobox->IsValid());
@@ -373,6 +374,7 @@ views::View* EditorViewController::CreateInputField(views::GridLayout* layout,
       // Set the initial value and validity state.
       base::string16 initial_value = GetInitialValueForType(field.type);
       text_field->SetText(initial_value);
+      text_field->SetAccessibleName(field.label);
       *valid = text_field->IsValid();
       if (!initial_value.empty())
         text_field->SetInvalid(!(*valid));