Merge MediaControlsChromium into MediaControls (2nd try)

Merge MediaControlsChromium into MediaControls (2nd try)

To the largest extent possible, code was copied from
MediaControlsChromium.* to MediaControls.* without modification. Where
MediaControlsChromium virtual functions called the MediaControls base
functions, the order was preserved to avoid changing behavior.

The 1st try broke Android: https://codereview.chromium.org/144083003/

The problem was that MediaControlsChromiumAndroid::createControls()
was merged into the Android MediaControls::create(), but obviously
that doesn't have access to the private members it needs.

Simplify things by having only a single implementation of create() and
make initializeControls() virtual instead. The ifdefery is thus
reduced to a single line in MediaControls::create().

BUG=341813
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=166893

[philipj_slow, 2014-02-08 18:31:02]

PTAL, I've fixed the Android build errors, made an apk for my phone and tested
that the controls still look and work as they should. PS1 is the previous patch
verbatim, and PS2 are the new changes.

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

https://codereview.chromium.org/158333002/diff/30001/Source/core/html/shadow/...
File Source/core/html/shadow/MediaControlsChromiumAndroid.h (right):

https://codereview.chromium.org/158333002/diff/30001/Source/core/html/shadow/...
Source/core/html/shadow/MediaControlsChromiumAndroid.h:51: friend class
MediaControls;
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:16]

https://codereview.chromium.org/158333002/diff/30001/Source/core/html/shadow/...
File Source/core/html/shadow/MediaControlsChromiumAndroid.h (right):

https://codereview.chromium.org/158333002/diff/30001/Source/core/html/shadow/...
Source/core/html/shadow/MediaControlsChromiumAndroid.h:51: friend class
MediaControls;
On 2014/02/10 18:27:32, acolwell wrote:
> 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.

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

[acolwell GONE FROM CHROMIUM, 2014-02-10 20:32:09]

lgtm

https://codereview.chromium.org/158333002/diff/180001/Source/core/html/shadow...
File Source/core/html/shadow/MediaControls.cpp (right):

https://codereview.chromium.org/158333002/diff/180001/Source/core/html/shadow...
Source/core/html/shadow/MediaControls.cpp:31: #include
"core/html/shadow/MediaControlsChromiumAndroid.h"
nit: Surround with #if OS(ANDROID)?

[philipj_slow, 2014-02-11 03:00:07]

https://codereview.chromium.org/158333002/diff/180001/Source/core/html/shadow...
File Source/core/html/shadow/MediaControls.cpp (right):

https://codereview.chromium.org/158333002/diff/180001/Source/core/html/shadow...
Source/core/html/shadow/MediaControls.cpp:31: #include
"core/html/shadow/MediaControlsChromiumAndroid.h"
On 2014/02/10 20:32:09, acolwell wrote:
> nit: Surround with #if OS(ANDROID)?

Done.

[philipj_slow, 2014-02-11 03:00:12]

The CQ bit was checked by philipj@opera.com

[commit-bot: I haz the power, 2014-02-11 03:00:19]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/philipj@opera.com/158333002/260001

[commit-bot: I haz the power, 2014-02-11 05:08:16]

Change committed as 166893