Media Controls: use kMedia{Play,Pause}Button for overlay play button.

This is removing the kMediaOverlayPlayButton and resolves the issue of
exposing only the play state to the accessibility tools with the new
media controls.

Bug: 829579
Change-Id: I4aa97ec6904933719bab02ef2451af0519230c03
Reviewed-on: https://chromium-review.googlesource.com/998553
Commit-Queue: Mounir Lamouri <mlamouri@chromium.org>
Reviewed-by: Becca Hughes <beccahughes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548748}

third_party/WebKit/Source/modules/accessibility/AXMediaControls.cpp

@@ -82,7 +82,6 @@ AXObject* AccessibilityMediaControl::Create(
     case kMediaVolumeSlider:
     case kMediaVolumeSliderThumb:
     case kMediaExitFullscreenButton:
-    case kMediaOverlayPlayButton:
     case kMediaCastOffButton:
     case kMediaCastOnButton:
     case kMediaOverlayCastOffButton:
@@ -121,7 +120,6 @@ String AccessibilityMediaControl::TextAlternative(
     case kMediaMuteButton:
       return QueryString(WebLocalizedString::kAXMediaMuteButton);
     case kMediaPlayButton:
-    case kMediaOverlayPlayButton:
       return QueryString(WebLocalizedString::kAXMediaPlayButton);
     case kMediaUnMuteButton:
       return QueryString(WebLocalizedString::kAXMediaUnMuteButton);
@@ -177,7 +175,6 @@ String AccessibilityMediaControl::Description(
     case kMediaMuteButton:
       return QueryString(WebLocalizedString::kAXMediaMuteButtonHelp);
     case kMediaPlayButton:
-    case kMediaOverlayPlayButton:
       return QueryString(WebLocalizedString::kAXMediaPlayButtonHelp);
     case kMediaUnMuteButton:
       return QueryString(WebLocalizedString::kAXMediaUnMuteButtonHelp);
@@ -242,7 +239,6 @@ AccessibilityRole AccessibilityMediaControl::RoleValue() const {
     case kMediaPauseButton:
     case kMediaShowClosedCaptionsButton:
     case kMediaHideClosedCaptionsButton:
-    case kMediaOverlayPlayButton:
     case kMediaOverlayCastOffButton:
     case kMediaOverlayCastOnButton:
     case kMediaOverflowButton:

third_party/WebKit/Source/modules/media_controls/elements/MediaControlElementType.h

@@ -28,7 +28,6 @@ enum MediaControlElementType {
   kMediaVolumeSlider,
   kMediaVolumeSliderThumb,
   kMediaExitFullscreenButton,
-  kMediaOverlayPlayButton,
   kMediaCastOffButton,
   kMediaCastOnButton,
   kMediaOverlayCastOffButton,

third_party/WebKit/Source/modules/media_controls/elements/MediaControlOverlayPlayButtonElement.cpp

@@ -114,7 +114,7 @@ void MediaControlOverlayPlayButtonElement::AnimatedArrow::Trace(
 //   This contains the inner circle with the actual play/pause icon.
 MediaControlOverlayPlayButtonElement::MediaControlOverlayPlayButtonElement(
     MediaControlsImpl& media_controls)
-    : MediaControlInputElement(media_controls, kMediaOverlayPlayButton),
+    : MediaControlInputElement(media_controls, kMediaPlayButton),
       tap_timer_(GetDocument().GetTaskRunner(TaskType::kMediaElementEvent),
                  this,
                  &MediaControlOverlayPlayButtonElement::TapTimerFired),
@@ -135,6 +135,10 @@ MediaControlOverlayPlayButtonElement::MediaControlOverlayPlayButtonElement(
 void MediaControlOverlayPlayButtonElement::UpdateDisplayType() {
   SetIsWanted(MediaElement().ShouldShowControls() &&
               (MediaControlsImpl::IsModern() || MediaElement().paused()));
+  if (MediaControlsImpl::IsModern()) {
+    SetDisplayType(MediaElement().paused() ? kMediaPlayButton
+                                           : kMediaPauseButton);
+  }
   MediaControlInputElement::UpdateDisplayType();
 }