[Payments] Improve some accessibility labels in editors

chrome/browser/ui/views/payments/credit_card_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/credit_card_editor_view_controller.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 262 matching lines @@
     columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, 1,
                        views::GridLayout::USE_PREF, 0, 0);
     // Space between the two comboboxes.
     constexpr int kHorizontalSpacing = 8;
     columns->AddPaddingColumn(0, kHorizontalSpacing);
     columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, 1,
                        views::GridLayout::USE_PREF, 0, 0);
 
     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();
     combobox_layout->AddView(month_combobox.release(), 1, 1,
                              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,
                              views::GridLayout::FILL, views::GridLayout::FILL,
                              0, kInputFieldHeight);
     view->SetLayoutManager(combobox_layout.release());
   }
 
   // Set the initial validity of the custom view.
   base::string16 month =
@@ skipping 403 matching lines @@
   return ValidateValue(combobox->GetTextForRow(combobox->selected_index()),
                        error_message);
 }
 
 bool CreditCardEditorViewController::GetSheetId(DialogViewID* sheet_id) {
   *sheet_id = DialogViewID::CREDIT_CARD_EDITOR_SHEET;
   return true;
 }
 
 }  // namespace payments