Replace kFileButtonChoose[FileLabel|MultipleFilesLabel] with IDS_FOO

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

  - WebLocalizedString::kFileButtonChooseFileLabel
  - WebLocalizedString::kFileButtonChooseMultipleFilesLabel

This CL keeps ToMessageID() and makes ToMessageID() returns
|resource_id| as is if it doesn't match to any of
WebLocalizedString::kFoo to replace WebLocalizedString::kFoo
gradually.

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

content/child/blink_platform_impl.cc

@@ -188,10 +188,6 @@ int ToMessageID(int resource_id) {
       return IDS_FORM_CALENDAR_TODAY;
     case WebLocalizedString::kDetailsLabel:
       return IDS_DETAILS_WITHOUT_SUMMARY_LABEL;
-    case WebLocalizedString::kFileButtonChooseFileLabel:
-      return IDS_FORM_FILE_BUTTON_LABEL;
-    case WebLocalizedString::kFileButtonChooseMultipleFilesLabel:
-      return IDS_FORM_MULTIPLE_FILES_BUTTON_LABEL;
     case WebLocalizedString::kFileButtonNoFileSelectedLabel:
       return IDS_FORM_FILE_NO_FILE_LABEL;
     case WebLocalizedString::kInputElementAltText:
@@ -342,14 +338,17 @@ int ToMessageID(int resource_id) {
       return IDS_UNITS_TEBIBYTES;
     case WebLocalizedString::kUnitsPebibytes:
       return IDS_UNITS_PEBIBYTES;
+    // There is no matched IDS_FOO for kBlockedPluginText. Return -1.
+    case WebLocalizedString::kBlockedPluginText:
+      return -1;
     // This "default:" line exists to avoid compile warnings about enum
-    // coverage when we add a new symbol to WebLocalizedString.h in WebKit.
-    // After a planned WebKit patch is landed, we need to add a case statement
+    // coverage when we add a new symbol to WebLocalizedString.h in blink.
+    // After a planned blink patch is landed, we need to add a case statement
     // for the added symbol here.
     default:
       break;
   }
-  return -1;
+  return resource_id;
 }
 
 // This must match third_party/WebKit/public/blink_resources.grd.

third_party/blink/public/platform/web_localized_string.h

@@ -86,8 +86,6 @@ struct WebLocalizedString {
     kCalendarClear,
     kCalendarToday,
     kDetailsLabel,
-    kFileButtonChooseFileLabel,
-    kFileButtonChooseMultipleFilesLabel,
     kFileButtonNoFileSelectedLabel,
     kInputElementAltText,
     kMediaRemotingCastText,

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

@@ -23,6 +23,7 @@
 #include "third_party/blink/renderer/core/html/forms/file_input_type.h"
 
 #include "third_party/blink/public/platform/file_path_conversion.h"
+#include "third_party/blink/public/strings/grit/blink_strings.h"
 #include "third_party/blink/renderer/core/css/style_change_reason.h"
 #include "third_party/blink/renderer/core/dom/events/event.h"
 #include "third_party/blink/renderer/core/dom/shadow_root.h"
@@ -315,9 +316,8 @@ void FileInputType::CreateShadowSubtree() {
   button->setAttribute(
       kValueAttr,
       AtomicString(GetLocale().QueryString(
-          GetElement().Multiple()
-              ? WebLocalizedString::kFileButtonChooseMultipleFilesLabel
-              : WebLocalizedString::kFileButtonChooseFileLabel)));
+          GetElement().Multiple() ? IDS_FORM_MULTIPLE_FILES_BUTTON_LABEL
+                                  : IDS_FORM_FILE_BUTTON_LABEL)));
   button->SetShadowPseudoId(AtomicString("-webkit-file-upload-button"));
   GetElement().UserAgentShadowRoot()->AppendChild(button);
 }
@@ -337,13 +337,13 @@ void FileInputType::MultipleAttributeChanged() {
   CHECK(!GetElement().UserAgentShadowRoot()->firstChild() ||
         IsA<Element>(GetElement().UserAgentShadowRoot()->firstChild()));
   if (Element* button =
-          To<Element>(GetElement().UserAgentShadowRoot()->firstChild()))
+          To<Element>(GetElement().UserAgentShadowRoot()->firstChild())) {
     button->setAttribute(
         kValueAttr,
         AtomicString(GetLocale().QueryString(
-            GetElement().Multiple()
-                ? WebLocalizedString::kFileButtonChooseMultipleFilesLabel
-                : WebLocalizedString::kFileButtonChooseFileLabel)));
+            GetElement().Multiple() ? IDS_FORM_MULTIPLE_FILES_BUTTON_LABEL
+                                    : IDS_FORM_FILE_BUTTON_LABEL)));
+  }
 }
 
 bool FileInputType::SetFiles(FileList* files) {