GMC: Move device button string to correct grd file

This change fixes a bug where the "Devices" button in GMC had no text
on Mac canary builds. The string associated with this button was moved
to a more appropriate grd file.

Bug: 1127069
Change-Id: Ic72ee633cdbd0094f7c6f402c15f2ea7a558a19a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2404942Reviewed-by: Tommy Steimel <steimel@chromium.org>
Commit-Queue: Noah Rose Ledesma <noahrose@google.com>
Cr-Commit-Position: refs/heads/master@{#805941}

chrome/app/chromium_strings.grd

@@ -1166,13 +1166,6 @@ Chromium is unable to recover your settings.
           Ask when I open Chromium
         </message>
       </if>
-
-      <!-- Global Media Controls -->
-      <if expr="not is_android">
-        <message name="IDS_GLOBAL_MEDIA_CONTROLS_DEVICES_BUTTON_LABEL" desc="Label for a button that opens a menu for picking an audio device to play from.">
-          Devices
-        </message>
-      </if>
     </messages>
   </release>
 </grit>

chrome/app/global_media_controls_strings.grdp

@@ -10,4 +10,7 @@
   <message name="IDS_GLOBAL_MEDIA_CONTROLS_DISMISS_ICON_TOOLTIP_TEXT" desc="Tooltip for the dismiss button within the Global Media Controls dialog. The tooltip appears on mouseover of the icon.">
    Dismiss
   </message>
+  <message name="IDS_GLOBAL_MEDIA_CONTROLS_DEVICES_BUTTON_LABEL" desc="Label for a button that opens a menu for picking an audio device to play from.">
+   Devices
+  </message>
 </grit-part>

chrome/browser/ui/views/global_media_controls/media_notification_device_selector_view.cc

@@ -8,7 +8,7 @@
 #include "base/util/ranges/algorithm.h"
 #include "chrome/browser/ui/global_media_controls/media_notification_container_impl.h"
 #include "chrome/browser/ui/views/global_media_controls/media_notification_device_selector_view_delegate.h"
-#include "chrome/grit/chromium_strings.h"
+#include "chrome/grit/generated_resources.h"
 #include "components/vector_icons/vector_icons.h"
 #include "media/audio/audio_device_description.h"
 #include "ui/base/l10n/l10n_util.h"