DO NOT LAND MediaControls trybot run

Source/core/html/shadow/MediaControlsAndroid.cpp

Index: Source/core/html/shadow/MediaControlsAndroid.cpp
diff --git a/Source/core/html/shadow/MediaControlsChromiumAndroid.cpp b/Source/core/html/shadow/MediaControlsAndroid.cpp
similarity index 75%
rename from Source/core/html/shadow/MediaControlsChromiumAndroid.cpp
rename to Source/core/html/shadow/MediaControlsAndroid.cpp
index f81c9309b37d7b509e7d11a6ab2c6fde35fadb7a..188562ccaf11608dfa8c1a843360be4dacc4d57f 100644
--- a/Source/core/html/shadow/MediaControlsChromiumAndroid.cpp
+++ b/Source/core/html/shadow/MediaControlsAndroid.cpp
@@ -24,15 +24,15 @@
  */
 
 #include "config.h"
-#include "core/html/shadow/MediaControlsChromiumAndroid.h"
+#include "core/html/shadow/MediaControlsAndroid.h"
 
 #include "bindings/v8/ExceptionState.h"
 #include "bindings/v8/ExceptionStatePlaceholder.h"
 
 namespace WebCore {
 
-MediaControlsChromiumAndroid::MediaControlsChromiumAndroid(Document& document)
-    : MediaControlsChromium(document)
+MediaControlsAndroid::MediaControlsAndroid(Document& document)
+    : MediaControls(document)
     , m_overlayPlayButton(0)
     , m_overlayEnclosure(0)
 {
@@ -40,15 +40,10 @@ MediaControlsChromiumAndroid::MediaControlsChromiumAndroid(Document& document)
 
 PassRefPtr<MediaControls> MediaControls::create(Document& document)
 {
-    return MediaControlsChromiumAndroid::createControls(document);
-}
-
-PassRefPtr<MediaControlsChromiumAndroid> MediaControlsChromiumAndroid::createControls(Document& document)
-{
     if (!document.page())
         return 0;
 
-    RefPtr<MediaControlsChromiumAndroid> controls = adoptRef(new MediaControlsChromiumAndroid(document));
+    RefPtr<MediaControlsAndroid> controls = adoptRef(new MediaControlsAndroid(document));
 
     TrackExceptionState exceptionState;
 
@@ -70,28 +65,28 @@ PassRefPtr<MediaControlsChromiumAndroid> MediaControlsChromiumAndroid::createCon
     return 0;
 }
 
-void MediaControlsChromiumAndroid::setMediaController(MediaControllerInterface* controller)
+void MediaControlsAndroid::setMediaController(MediaControllerInterface* controller)
 {
     if (m_overlayPlayButton)
         m_overlayPlayButton->setMediaController(controller);
     if (m_overlayEnclosure)
         m_overlayEnclosure->setMediaController(controller);
-    MediaControlsChromium::setMediaController(controller);
+    MediaControls::setMediaController(controller);
 }
 
-void MediaControlsChromiumAndroid::playbackStarted()
+void MediaControlsAndroid::playbackStarted()
 {
     m_overlayPlayButton->updateDisplayType();
-    MediaControlsChromium::playbackStarted();
+    MediaControls::playbackStarted();
 }
 
-void MediaControlsChromiumAndroid::playbackStopped()
+void MediaControlsAndroid::playbackStopped()
 {
     m_overlayPlayButton->updateDisplayType();
-    MediaControlsChromium::playbackStopped();
+    MediaControls::playbackStopped();
 }
 
-void MediaControlsChromiumAndroid::insertTextTrackContainer(PassRefPtr<MediaControlTextTrackContainerElement> textTrackContainer)
+void MediaControlsAndroid::insertTextTrackContainer(PassRefPtr<MediaControlTextTrackContainerElement> textTrackContainer)
 {
     // Insert it before the overlay play button so it always displays behind it.
     m_overlayEnclosure->insertBefore(textTrackContainer, m_overlayPlayButton);