Merge MediaControlsChromium into MediaControls

Source/core/html/shadow/MediaControlsChromiumAndroid.cpp

Index: Source/core/html/shadow/MediaControlsChromiumAndroid.cpp
diff --git a/Source/core/html/shadow/MediaControlsChromiumAndroid.cpp b/Source/core/html/shadow/MediaControlsChromiumAndroid.cpp
index f81c9309b37d7b509e7d11a6ab2c6fde35fadb7a..a88ceafa609d4d311501c53f6041401024285dc3 100644
--- a/Source/core/html/shadow/MediaControlsChromiumAndroid.cpp
+++ b/Source/core/html/shadow/MediaControlsChromiumAndroid.cpp
@@ -32,7 +32,7 @@
 namespace WebCore {
 
 MediaControlsChromiumAndroid::MediaControlsChromiumAndroid(Document& document)
-    : MediaControlsChromium(document)
+    : MediaControls(document)
     , m_overlayPlayButton(0)
     , m_overlayEnclosure(0)
 {
@@ -40,11 +40,6 @@ 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;
 
@@ -76,19 +71,19 @@ void MediaControlsChromiumAndroid::setMediaController(MediaControllerInterface*
         m_overlayPlayButton->setMediaController(controller);
     if (m_overlayEnclosure)
         m_overlayEnclosure->setMediaController(controller);
-    MediaControlsChromium::setMediaController(controller);
+    MediaControls::setMediaController(controller);
 }
 
 void MediaControlsChromiumAndroid::playbackStarted()
 {
     m_overlayPlayButton->updateDisplayType();
-    MediaControlsChromium::playbackStarted();
+    MediaControls::playbackStarted();
 }
 
 void MediaControlsChromiumAndroid::playbackStopped()
 {
     m_overlayPlayButton->updateDisplayType();
-    MediaControlsChromium::playbackStopped();
+    MediaControls::playbackStopped();
 }
 
 void MediaControlsChromiumAndroid::insertTextTrackContainer(PassRefPtr<MediaControlTextTrackContainerElement> textTrackContainer)