Removes the display of duplicate a11y information.

When Talkback reads the media controls, it was reading both the name and
description of the control. For most of the controls, the name and
description were pretty similar, if not the same, so instead of getting
useful information, the user just gets the same thing said twice. this
change prevents this by return an empty string instead of the help string.

Bug: 560566
Change-Id: Id7c0fb95c779898a8bfe05d0d08fd42323098887
Reviewed-on: https://chromium-review.googlesource.com/c/1244583Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Commit-Queue: CJ DiMeglio <lethalantidote@chromium.org>
Cr-Commit-Position: refs/heads/master@{#596080}

chrome/browser/resources/chromeos/chromevox/cvox2/background/output_test.extjs

@@ -229,19 +229,18 @@ TEST_F('OutputE2ETest', 'Audio', function() {
           .withoutHints()
           .withSpeechAndBraille(range, null, 'navigate');
 
-      checkSpeechOutput('play|Button|begin playback|audio|Tool bar',
+      checkSpeechOutput('play|Button|audio|Tool bar',
           [
             {value: new Output.EarconAction('BUTTON'), start: 0, end: 4},
-            {value: 'description', start: 12, end: 26},
-            {value: 'name', start: 27, end: 32},
-            {value: 'role', start: 33, end: 41}
+            {value: 'name', start: 12, end: 17},
+            {value: 'role', start: 18, end: 26}
           ],
           o);
 
       checkBrailleOutput(
-          'play btn begin playback audio tlbar',
-          [{value: new Output.NodeSpan(el), start: 0, end: 23},
-           {value: new Output.NodeSpan(el.parent), start: 24, end: 35}],
+          'play btn audio tlbar',
+          [{value: new Output.NodeSpan(el), start: 0, end: 8},
+           {value: new Output.NodeSpan(el.parent), start: 9, end: 20}],
           o);
 
       // TODO(dmazzoni/dtseng): Replace with a query.

content/app/strings/content_strings.grd

@@ -704,22 +704,6 @@ below:
         video
       </message>
 
-      <message name="IDS_AX_MEDIA_MUTE_BUTTON_HELP" desc="Accessibility help description for mute button">
-        mute audio track
-      </message>
-
-      <message name="IDS_AX_MEDIA_UNMUTE_BUTTON_HELP" desc="Accessibility help description for turn mute off button">
-        unmute audio track
-      </message>
-
-      <message name="IDS_AX_MEDIA_PLAY_BUTTON_HELP" desc="Accessibility help description for play button">
-        begin playback
-      </message>
-
-      <message name="IDS_AX_MEDIA_PAUSE_BUTTON_HELP" desc="Accessibility help description for pause button">
-        pause playback
-      </message>
-
       <message name="IDS_AX_MEDIA_AUDIO_SLIDER_HELP" desc="Accessibility help description for audio timeline slider">
         audio time scrubber
       </message>
@@ -740,42 +724,6 @@ below:
         number of seconds of movie remaining
       </message>
 
-      <message name="IDS_AX_MEDIA_ENTER_FULL_SCREEN_BUTTON_HELP" desc="Accessibility help description for enter fullscreen button">
-        play movie in full screen mode
-      </message>
-
-      <message name="IDS_AX_MEDIA_EXIT_FULL_SCREEN_BUTTON_HELP" desc="Accessibility help description for exit fullscreen button">
-        exit full screen
-      </message>
-
-      <message name="IDS_AX_MEDIA_DISPLAY_CUT_OUT_FULL_SCREEN_BUTTON_HELP" desc="Accessibility help description for display cutout fullscreen button">
-        toggle fullscreen into display cutout area
-      </message>
-
-      <message name="IDS_AX_MEDIA_ENTER_PICTURE_IN_PICTURE_BUTTON_HELP" desc="Accessibility help description for enter Picture-in-Picture button">
-        play video in picture-in-picture mode
-      </message>
-
-      <message name="IDS_AX_MEDIA_EXIT_PICTURE_IN_PICTURE_BUTTON_HELP" desc="Accessibility help description for exit Picture-in-Picture button">
-        exit picture-in-picture
-      </message>
-
-      <message name="IDS_AX_MEDIA_SHOW_CLOSED_CAPTIONS_BUTTON_HELP" desc="Accessibility help description for show closed captions button">
-        start displaying closed captions
-      </message>
-
-      <message name="IDS_AX_MEDIA_HIDE_CLOSED_CAPTIONS_BUTTON_HELP" desc="Accessibility help description for hide closed captions button">
-        stop displaying closed captions
-      </message>
-
-      <message name="IDS_AX_MEDIA_CAST_OFF_BUTTON_HELP" desc="Accessibility help description for remote playback button">
-        play on remote device
-      </message>
-
-      <message name="IDS_AX_MEDIA_CAST_ON_BUTTON_HELP" desc="Accessibility help description for remote playback control button">
-        control remote playback
-      </message>
-
       <message name="IDS_AX_MEDIA_OVERFLOW_BUTTON_HELP" desc="Accessibility help description for overflow button.">
         more options
       </message>

content/child/blink_platform_impl.cc

@@ -126,14 +126,6 @@ static int ToMessageID(WebLocalizedString::Name name) {
       return IDS_AX_MEDIA_AUDIO_ELEMENT_HELP;
     case WebLocalizedString::kAXMediaVideoElementHelp:
       return IDS_AX_MEDIA_VIDEO_ELEMENT_HELP;
-    case WebLocalizedString::kAXMediaMuteButtonHelp:
-      return IDS_AX_MEDIA_MUTE_BUTTON_HELP;
-    case WebLocalizedString::kAXMediaUnMuteButtonHelp:
-      return IDS_AX_MEDIA_UNMUTE_BUTTON_HELP;
-    case WebLocalizedString::kAXMediaPlayButtonHelp:
-      return IDS_AX_MEDIA_PLAY_BUTTON_HELP;
-    case WebLocalizedString::kAXMediaPauseButtonHelp:
-      return IDS_AX_MEDIA_PAUSE_BUTTON_HELP;
     case WebLocalizedString::kAXMediaAudioSliderHelp:
       return IDS_AX_MEDIA_AUDIO_SLIDER_HELP;
     case WebLocalizedString::kAXMediaVideoSliderHelp:
@@ -144,24 +136,6 @@ static int ToMessageID(WebLocalizedString::Name name) {
       return IDS_AX_MEDIA_CURRENT_TIME_DISPLAY_HELP;
     case WebLocalizedString::kAXMediaTimeRemainingDisplayHelp:
       return IDS_AX_MEDIA_TIME_REMAINING_DISPLAY_HELP;
-    case WebLocalizedString::kAXMediaEnterFullscreenButtonHelp:
-      return IDS_AX_MEDIA_ENTER_FULL_SCREEN_BUTTON_HELP;
-    case WebLocalizedString::kAXMediaExitFullscreenButtonHelp:
-      return IDS_AX_MEDIA_EXIT_FULL_SCREEN_BUTTON_HELP;
-    case WebLocalizedString::kAXMediaDisplayCutoutFullscreenButtonHelp:
-      return IDS_AX_MEDIA_DISPLAY_CUT_OUT_FULL_SCREEN_BUTTON_HELP;
-    case WebLocalizedString::kAXMediaEnterPictureInPictureButtonHelp:
-      return IDS_AX_MEDIA_ENTER_PICTURE_IN_PICTURE_BUTTON_HELP;
-    case WebLocalizedString::kAXMediaExitPictureInPictureButtonHelp:
-      return IDS_AX_MEDIA_EXIT_PICTURE_IN_PICTURE_BUTTON_HELP;
-    case WebLocalizedString::kAXMediaShowClosedCaptionsButtonHelp:
-      return IDS_AX_MEDIA_SHOW_CLOSED_CAPTIONS_BUTTON_HELP;
-    case WebLocalizedString::kAXMediaHideClosedCaptionsButtonHelp:
-      return IDS_AX_MEDIA_HIDE_CLOSED_CAPTIONS_BUTTON_HELP;
-    case WebLocalizedString::kAXMediaCastOffButtonHelp:
-      return IDS_AX_MEDIA_CAST_OFF_BUTTON_HELP;
-    case WebLocalizedString::kAXMediaCastOnButtonHelp:
-      return IDS_AX_MEDIA_CAST_ON_BUTTON_HELP;
     case WebLocalizedString::kAXMediaOverflowButtonHelp:
       return IDS_AX_MEDIA_OVERFLOW_BUTTON_HELP;
     case WebLocalizedString::kAXMillisecondFieldText:

content/test/data/accessibility/html/audio-expected-auralinux.txt

@@ -4,8 +4,8 @@
 ++++++[section]
 ++++++++[tool bar] name='audio' description='audio' horizontal
 ++++++++++[tool bar] name='audio' description='audio' horizontal
-++++++++++++[push button] name='play' description='begin playback' xml-roles:button
+++++++++++++[push button] name='play' xml-roles:button
 ++++++++++++[text] name='0:00'
 ++++++++++++[text] name='/ 0:00'
 ++++++++++++[slider] description='audio time scrubber' horizontal xml-roles:slider
-++++++++++++[push button] name='mute' description='mute audio track' xml-roles:button
+++++++++++++[push button] name='mute' xml-roles:button

content/test/data/accessibility/html/source-expected-auralinux.txt

@@ -4,8 +4,8 @@
 ++++++[section]
 ++++++++[tool bar] name='audio' description='audio' horizontal
 ++++++++++[tool bar] name='audio' description='audio' horizontal
-++++++++++++[push button] name='play' description='begin playback' focusable
+++++++++++++[push button] name='play' focusable
 ++++++++++++[text] name='0:00'
 ++++++++++++[text] name='/ 0:00'
 ++++++++++++[slider] description='audio time scrubber' focusable horizontal
-++++++++++++[push button] name='mute' description='mute audio track'
+++++++++++++[push button] name='mute'

third_party/blink/public/platform/web_localized_string.h

@@ -47,43 +47,30 @@ struct WebLocalizedString {
     kAXMediaAudioElementHelp,
     kAXMediaAudioSliderHelp,
     kAXMediaCastOffButton,
-    kAXMediaCastOffButtonHelp,
     kAXMediaCastOnButton,
-    kAXMediaCastOnButtonHelp,
     kAXMediaCurrentTimeDisplay,
     kAXMediaCurrentTimeDisplayHelp,
     kAXMediaDefault,
     kAXMediaDownloadButton,
     kAXMediaEnterFullscreenButton,
-    kAXMediaEnterFullscreenButtonHelp,
     kAXMediaExitFullscreenButton,
-    kAXMediaExitFullscreenButtonHelp,
     kAXMediaHideClosedCaptionsButton,
-    kAXMediaHideClosedCaptionsButtonHelp,
     kAXMediaMuteButton,
-    kAXMediaMuteButtonHelp,
     kAXMediaDisplayCutoutFullscreenButton,
-    kAXMediaDisplayCutoutFullscreenButtonHelp,
     kAXMediaOverflowButton,
     kAXMediaOverflowButtonHelp,
     kAXMediaPauseButton,
-    kAXMediaPauseButtonHelp,
     kAXMediaPlayButton,
-    kAXMediaPlayButtonHelp,
     kAXMediaShowClosedCaptionsButton,
-    kAXMediaShowClosedCaptionsButtonHelp,
     kAXMediaTimeRemainingDisplay,
     kAXMediaTimeRemainingDisplayHelp,
     kAXMediaUnMuteButton,
-    kAXMediaUnMuteButtonHelp,
     kAXMediaVideoElement,
     kAXMediaVideoElementHelp,
     kAXMediaVideoSliderHelp,
     kAXMediaVolumeSliderHelp,
     kAXMediaEnterPictureInPictureButton,
-    kAXMediaEnterPictureInPictureButtonHelp,
     kAXMediaExitPictureInPictureButton,
-    kAXMediaExitPictureInPictureButtonHelp,
     kAXMillisecondFieldText,
     kAXMinuteFieldText,
     kAXMonthFieldText,

third_party/blink/renderer/modules/accessibility/ax_media_controls.cc

@@ -195,45 +195,31 @@ String AccessibilityMediaControl::Description(
     ax::mojom::DescriptionFrom& description_from,
     AXObjectVector* description_objects) const {
   switch (ControlType()) {
+    case kMediaCurrentTimeDisplay:
+      return QueryString(WebLocalizedString::kAXMediaCurrentTimeDisplayHelp);
+    case kMediaTimeRemainingDisplay:
+      return QueryString(WebLocalizedString::kAXMediaTimeRemainingDisplayHelp);
+    case kMediaOverflowButton:
+      return QueryString(WebLocalizedString::kAXMediaOverflowButtonHelp);
+    // The following descriptions are repeats of their respective titles. When
+    // read by accessibility, we get the same thing said twice, with no value
+    // added. So instead, we just return an empty string.
     case kMediaEnterFullscreenButton:
-      return QueryString(WebLocalizedString::kAXMediaEnterFullscreenButtonHelp);
     case kMediaExitFullscreenButton:
-      return QueryString(WebLocalizedString::kAXMediaExitFullscreenButtonHelp);
+    case kMediaDisplayCutoutFullscreenButton:
     case kMediaMuteButton:
-      return QueryString(WebLocalizedString::kAXMediaMuteButtonHelp);
-    case kMediaPlayButton:
-      return QueryString(WebLocalizedString::kAXMediaPlayButtonHelp);
     case kMediaUnMuteButton:
-      return QueryString(WebLocalizedString::kAXMediaUnMuteButtonHelp);
+    case kMediaPlayButton:
     case kMediaPauseButton:
-      return QueryString(WebLocalizedString::kAXMediaPauseButtonHelp);
-    case kMediaCurrentTimeDisplay:
-      return QueryString(WebLocalizedString::kAXMediaCurrentTimeDisplayHelp);
-    case kMediaTimeRemainingDisplay:
-      return QueryString(WebLocalizedString::kAXMediaTimeRemainingDisplayHelp);
     case kMediaShowClosedCaptionsButton:
-      return QueryString(
-          WebLocalizedString::kAXMediaShowClosedCaptionsButtonHelp);
     case kMediaHideClosedCaptionsButton:
-      return QueryString(
-          WebLocalizedString::kAXMediaHideClosedCaptionsButtonHelp);
     case kMediaCastOffButton:
     case kMediaOverlayCastOffButton:
-      return QueryString(WebLocalizedString::kAXMediaCastOffButtonHelp);
     case kMediaCastOnButton:
     case kMediaOverlayCastOnButton:
-      return QueryString(WebLocalizedString::kAXMediaCastOnButtonHelp);
-    case kMediaOverflowButton:
-      return QueryString(WebLocalizedString::kAXMediaOverflowButtonHelp);
     case kMediaEnterPictureInPictureButton:
-      return QueryString(
-          WebLocalizedString::kAXMediaEnterPictureInPictureButtonHelp);
     case kMediaExitPictureInPictureButton:
-      return QueryString(
-          WebLocalizedString::kAXMediaExitPictureInPictureButtonHelp);
-    case kMediaDisplayCutoutFullscreenButton:
-      return QueryString(
-          WebLocalizedString::kAXMediaDisplayCutoutFullscreenButtonHelp);
+      return "";
     case kMediaSliderThumb:
     case kMediaTextTrackList:
     case kMediaTimelineContainer: