Replace kAXFooFieldText with IDS_FOO

As a step to remove all uses of WebLocalizedString::kFooBar,
this CL replaces below ones with matched IDS_FOO.

  - WebLocalizedString::kAXMillisecondFieldText
  - WebLocalizedString::kAXMinuteFieldText
  - WebLocalizedString::kAXMonthFieldText
  - WebLocalizedString::kAXSecondFieldText
  - WebLocalizedString::kAXWeekOfYearFieldText
  - WebLocalizedString::kAXYearFieldText

Bug: 995644
Change-Id: I09495c8f2737a398e1b553b2b006f44e424f6686
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1820398Reviewed-by: Kent Tamura <tkent@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Gyuyoung Kim <gyuyoung@igalia.com>
Cr-Commit-Position: refs/heads/master@{#699203}

content/child/blink_platform_impl.cc

@@ -160,18 +160,6 @@ int ToMessageID(int resource_id) {
       return IDS_AX_MEDIA_TOUCHLESS_SEEK_ACTION;
     case WebLocalizedString::kAXMediaTouchLessVolumeAction:
       return IDS_AX_MEDIA_TOUCHLESS_VOLUME_ACTION;
-    case WebLocalizedString::kAXMillisecondFieldText:
-      return IDS_AX_MILLISECOND_FIELD_TEXT;
-    case WebLocalizedString::kAXMinuteFieldText:
-      return IDS_AX_MINUTE_FIELD_TEXT;
-    case WebLocalizedString::kAXMonthFieldText:
-      return IDS_AX_MONTH_FIELD_TEXT;
-    case WebLocalizedString::kAXSecondFieldText:
-      return IDS_AX_SECOND_FIELD_TEXT;
-    case WebLocalizedString::kAXWeekOfYearFieldText:
-      return IDS_AX_WEEK_OF_YEAR_FIELD_TEXT;
-    case WebLocalizedString::kAXYearFieldText:
-      return IDS_AX_YEAR_FIELD_TEXT;
     case WebLocalizedString::kCalendarClear:
       return IDS_FORM_CALENDAR_CLEAR;
     case WebLocalizedString::kCalendarToday:

third_party/blink/public/platform/web_localized_string.h

@@ -71,12 +71,6 @@ struct WebLocalizedString {
     kAXMediaTouchLessPlayPauseAction,
     kAXMediaTouchLessSeekAction,
     kAXMediaTouchLessVolumeAction,
-    kAXMillisecondFieldText,
-    kAXMinuteFieldText,
-    kAXMonthFieldText,
-    kAXSecondFieldText,
-    kAXWeekOfYearFieldText,
-    kAXYearFieldText,
     kBlockedPluginText,
     kCalendarClear,
     kCalendarToday,

third_party/blink/renderer/core/html/forms/date_time_field_elements.cc

@@ -25,6 +25,7 @@
 
 #include "third_party/blink/renderer/core/html/forms/date_time_field_elements.h"
 
+#include "third_party/blink/public/strings/grit/blink_strings.h"
 #include "third_party/blink/renderer/core/html/forms/date_time_fields_state.h"
 #include "third_party/blink/renderer/platform/text/date_components.h"
 #include "third_party/blink/renderer/platform/text/platform_locale.h"
@@ -34,8 +35,8 @@ namespace blink {
 
 using blink::WebLocalizedString;
 
-static String QueryString(WebLocalizedString::Name name) {
-  return Locale::DefaultLocale().QueryString(name);
+static String QueryString(int resource_id) {
+  return Locale::DefaultLocale().QueryString(resource_id);
 }
 
 DateTimeAMPMFieldElement::DateTimeAMPMFieldElement(
@@ -386,8 +387,7 @@ DateTimeMillisecondFieldElement::DateTimeMillisecondFieldElement(
                                   step) {
   DEFINE_STATIC_LOCAL(AtomicString, millisecond_pseudo_id,
                       ("-webkit-datetime-edit-millisecond-field"));
-  Initialize(millisecond_pseudo_id,
-             QueryString(WebLocalizedString::kAXMillisecondFieldText));
+  Initialize(millisecond_pseudo_id, QueryString(IDS_AX_MILLISECOND_FIELD_TEXT));
 }
 
 void DateTimeMillisecondFieldElement::PopulateDateTimeFieldsState(
@@ -431,8 +431,7 @@ DateTimeMinuteFieldElement::DateTimeMinuteFieldElement(Document& document,
                                   step) {
   DEFINE_STATIC_LOCAL(AtomicString, minute_pseudo_id,
                       ("-webkit-datetime-edit-minute-field"));
-  Initialize(minute_pseudo_id,
-             QueryString(WebLocalizedString::kAXMinuteFieldText));
+  Initialize(minute_pseudo_id, QueryString(IDS_AX_MINUTE_FIELD_TEXT));
 }
 
 void DateTimeMinuteFieldElement::PopulateDateTimeFieldsState(
@@ -474,8 +473,7 @@ DateTimeMonthFieldElement::DateTimeMonthFieldElement(Document& document,
                                   placeholder.IsEmpty() ? "--" : placeholder) {
   DEFINE_STATIC_LOCAL(AtomicString, month_pseudo_id,
                       ("-webkit-datetime-edit-month-field"));
-  Initialize(month_pseudo_id,
-             QueryString(WebLocalizedString::kAXMonthFieldText));
+  Initialize(month_pseudo_id, QueryString(IDS_AX_MONTH_FIELD_TEXT));
 }
 
 void DateTimeMonthFieldElement::PopulateDateTimeFieldsState(
@@ -518,8 +516,7 @@ DateTimeSecondFieldElement::DateTimeSecondFieldElement(Document& document,
                                   step) {
   DEFINE_STATIC_LOCAL(AtomicString, second_pseudo_id,
                       ("-webkit-datetime-edit-second-field"));
-  Initialize(second_pseudo_id,
-             QueryString(WebLocalizedString::kAXSecondFieldText));
+  Initialize(second_pseudo_id, QueryString(IDS_AX_SECOND_FIELD_TEXT));
 }
 
 void DateTimeSecondFieldElement::PopulateDateTimeFieldsState(
@@ -563,8 +560,7 @@ DateTimeSymbolicMonthFieldElement::DateTimeSymbolicMonthFieldElement(
                                    maximum) {
   DEFINE_STATIC_LOCAL(AtomicString, month_pseudo_id,
                       ("-webkit-datetime-edit-month-field"));
-  Initialize(month_pseudo_id,
-             QueryString(WebLocalizedString::kAXMonthFieldText));
+  Initialize(month_pseudo_id, QueryString(IDS_AX_MONTH_FIELD_TEXT));
 }
 
 void DateTimeSymbolicMonthFieldElement::PopulateDateTimeFieldsState(
@@ -609,8 +605,7 @@ DateTimeWeekFieldElement::DateTimeWeekFieldElement(Document& document,
                                   "--") {
   DEFINE_STATIC_LOCAL(AtomicString, week_pseudo_id,
                       ("-webkit-datetime-edit-week-field"));
-  Initialize(week_pseudo_id,
-             QueryString(WebLocalizedString::kAXWeekOfYearFieldText));
+  Initialize(week_pseudo_id, QueryString(IDS_AX_WEEK_OF_YEAR_FIELD_TEXT));
 }
 
 void DateTimeWeekFieldElement::PopulateDateTimeFieldsState(
@@ -658,7 +653,7 @@ DateTimeYearFieldElement::DateTimeYearFieldElement(
 
   DEFINE_STATIC_LOCAL(AtomicString, year_pseudo_id,
                       ("-webkit-datetime-edit-year-field"));
-  Initialize(year_pseudo_id, QueryString(WebLocalizedString::kAXYearFieldText));
+  Initialize(year_pseudo_id, QueryString(IDS_AX_YEAR_FIELD_TEXT));
 }
 
 static int CurrentFullYear() {