Merge MediaControlsChromium into MediaControls (2nd try)

Source/core/html/shadow/MediaControlsChromiumAndroid.h

Index: Source/core/html/shadow/MediaControlsChromiumAndroid.h
diff --git a/Source/core/html/shadow/MediaControlsChromiumAndroid.h b/Source/core/html/shadow/MediaControlsChromiumAndroid.h
index 7627b85c59a6fc71d18fe913522c75d69e23dabf..a49ae03f3f64141ad36999c76822d4f96eecd242 100644
--- a/Source/core/html/shadow/MediaControlsChromiumAndroid.h
+++ b/Source/core/html/shadow/MediaControlsChromiumAndroid.h
@@ -27,13 +27,12 @@
 #define MediaControlsChromiumAndroid_h
 
 #include "core/html/shadow/MediaControls.h"
-#include "core/html/shadow/MediaControlsChromium.h"
 
 namespace WebCore {
 
-class MediaControlsChromiumAndroid FINAL : public MediaControlsChromium {
+class MediaControlsChromiumAndroid FINAL : public MediaControls {
 public:
-    static PassRefPtr<MediaControlsChromiumAndroid> createControls(Document&);
+    explicit MediaControlsChromiumAndroid(Document&);
 
     virtual void setMediaController(MediaControllerInterface*) OVERRIDE;
     virtual void playbackStarted() OVERRIDE;
@@ -43,7 +42,7 @@ public:
     virtual void insertTextTrackContainer(PassRefPtr<MediaControlTextTrackContainerElement>) OVERRIDE;
 
 private:
-    explicit MediaControlsChromiumAndroid(Document&);
+    virtual bool initializeControls(Document&) OVERRIDE;
 
     MediaControlOverlayPlayButtonElement* m_overlayPlayButton;
     MediaControlOverlayEnclosureElement* m_overlayEnclosure;