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..1c2dc10a528d202a0df96d1dcd95884e099fab7e 100644
--- a/Source/core/html/shadow/MediaControlsChromiumAndroid.h
+++ b/Source/core/html/shadow/MediaControlsChromiumAndroid.h
@@ -27,14 +27,11 @@
 #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&);
-
     virtual void setMediaController(MediaControllerInterface*) OVERRIDE;
     virtual void playbackStarted() OVERRIDE;
     virtual void playbackStopped() OVERRIDE;
@@ -45,8 +42,13 @@ public:
 private:
     explicit MediaControlsChromiumAndroid(Document&);
 
+    virtual bool initializeControls(Document&) OVERRIDE;
+
     MediaControlOverlayPlayButtonElement* m_overlayPlayButton;
     MediaControlOverlayEnclosureElement* m_overlayEnclosure;
+
+    // MediaControls::create needs the constructor.
+    friend class MediaControls;

[acolwell GONE FROM CHROMIUM, 2014/02/10 18:27:32]

Why is this friend declaration needed now? AFAICT MediaControls needed this
access before but didn't have the friend decl. Having a static inline create()
method or just making the constructor public seems like a better path than
making this a friend.

[philipj_slow, 2014/02/10 20:13:17]

Done. (I thought it would be nice to let MediaControls::create be the only way
to get a MediaControls instance, but never mind that.)

 };
 
 }