Replace kCalendar[Clear|Today] with IDS_FOO

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

  - WebLocalizedString::kCalendarClear
  - WebLocalizedString::kCalendarToday

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

content/child/blink_platform_impl.cc

@@ -160,10 +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::kCalendarClear:
-      return IDS_FORM_CALENDAR_CLEAR;
-    case WebLocalizedString::kCalendarToday:
-      return IDS_FORM_CALENDAR_TODAY;
     case WebLocalizedString::kDetailsLabel:
       return IDS_DETAILS_WITHOUT_SUMMARY_LABEL;
     case WebLocalizedString::kFileButtonNoFileSelectedLabel:

content/test/BUILD.gn

@@ -414,6 +414,7 @@ jumbo_static_library("test_support") {
     "//storage/common",
     "//testing/gmock",
     "//testing/gtest",
+    "//third_party/blink/public/strings:strings_grit",
     "//third_party/webrtc/api:libjingle_peerconnection_api",
     "//third_party/webrtc/api:media_stream_interface",
     "//third_party/webrtc/api:rtc_stats_api",

content/test/test_blink_web_unit_test_support.cc

@@ -40,6 +40,7 @@
 #include "third_party/blink/public/platform/web_string.h"
 #include "third_party/blink/public/platform/web_url.h"
 #include "third_party/blink/public/platform/web_url_loader_factory.h"
+#include "third_party/blink/public/strings/grit/blink_strings.h"
 #include "third_party/blink/public/web/blink.h"
 #include "v8/include/v8.h"
 
@@ -230,9 +231,9 @@ blink::WebString TestBlinkWebUnitTestSupport::QueryLocalizedString(
       return WebString::FromASCII("<<OtherMonthLabel>>");
     case blink::WebLocalizedString::kOtherWeekLabel:
       return WebString::FromASCII("<<OtherWeekLabel>>");
-    case blink::WebLocalizedString::kCalendarClear:
+    case IDS_FORM_CALENDAR_CLEAR:
       return WebString::FromASCII("<<CalendarClear>>");
-    case blink::WebLocalizedString::kCalendarToday:
+    case IDS_FORM_CALENDAR_TODAY:
       return WebString::FromASCII("<<CalendarToday>>");
     case blink::WebLocalizedString::kThisMonthButtonLabel:
       return WebString::FromASCII("<<ThisMonthLabel>>");

third_party/blink/public/platform/web_localized_string.h

@@ -72,8 +72,6 @@ struct WebLocalizedString {
     kAXMediaTouchLessSeekAction,
     kAXMediaTouchLessVolumeAction,
     kBlockedPluginText,
-    kCalendarClear,
-    kCalendarToday,
     kDetailsLabel,
     kFileButtonNoFileSelectedLabel,
     kInputElementAltText,

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

@@ -117,8 +117,7 @@ void DateTimeChooserImpl::WriteDocument(SharedBuffer* data) {
     other_date_label_string =
         GetLocale().QueryString(WebLocalizedString::kOtherWeekLabel);
   } else {
-    today_label_string =
-        GetLocale().QueryString(WebLocalizedString::kCalendarToday);
+    today_label_string = GetLocale().QueryString(IDS_FORM_CALENDAR_TODAY);
     other_date_label_string =
         GetLocale().QueryString(WebLocalizedString::kOtherDateLabel);
   }
@@ -155,8 +154,7 @@ void DateTimeChooserImpl::WriteDocument(SharedBuffer* data) {
       data);
   AddProperty("locale", parameters_->locale.GetString(), data);
   AddProperty("todayLabel", today_label_string, data);
-  AddProperty("clearLabel",
-              GetLocale().QueryString(WebLocalizedString::kCalendarClear),
+  AddProperty("clearLabel", GetLocale().QueryString(IDS_FORM_CALENDAR_CLEAR),
               data);
   AddProperty("weekLabel",
               GetLocale().QueryString(WebLocalizedString::kWeekNumberLabel),