Merge MediaControlsAndroid into MediaControls

Merge MediaControlsAndroid into MediaControls

The additional functionality in MediaControlsAndroid is so small that
merging it was trivial. Just use CSS to hide the overlay enclosure.

One unsightly ifdef remains in MediaControls::shouldHideControls(),
hopefully this can eventually be removed by using a setting or perhaps
checking the device capabilities.

MediaControls::createTextTrackDisplay() was made simpler.

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

[philipj_slow, 2014-03-10 17:33:45]

PTAL. It's been frustrating at times to work on this because the Android code
isn't compiled. There's still more to clean up, but I'm trying to not make any
observable changes in this step.

Depends on https://codereview.chromium.org/190463002/

[acolwell GONE FROM CHROMIUM, 2014-03-10 21:06:12]

On 2014/03/10 17:33:45, philipj wrote:
> PTAL. It's been frustrating at times to work on this because the Android code
> isn't compiled. There's still more to clean up, but I'm trying to not make any
> observable changes in this step.
> 
> Depends on https://codereview.chromium.org/190463002/

I'm on the fence about this change. I worry that, for the majority of our
platforms, this runs code that is never actually visible to the user. I realize
it is trivial code, but I could easily see people missing the subtlety of CSS
making this control not visible for all platforms but Android. WDYT about
conditionally creating the controls and having code that checks to see if
m_overlayPlayButton is non-null? I realize that this is a little less clean than
what you have here, but I think it would make it more clear that the overlay is
an optional part of the controls. I feel like this turns things into a "has-a"
situation instead of a "is-a" one which I think is a step in the right
direction.

[philipj_slow, 2014-03-11 11:36:40]

I've tried to make things more explicit now and think it's for the better,
thanks for the suggestion!

Certainly the ifdef around the config is not ideal, maybe it can be replaced by
a setting or two at some point.

[philipj_slow, 2014-03-11 17:07:56]

I reverted the simplifcation to MediaControls::createTextTrackDisplay(), since
after testing with the Android code paths I found that it actually made text
track cues end up in a different place. Reverted to be identical to the original
code. Unfortunately I can't create a test that would catch it, since it's
Android-only and we don't even run tests on Android...

FWIW, I want to split the text track stuff out from MediaControls, at which
point I hope this would become less ugly again. (The controls code should just
tell the text track layout which regions are occupied, but otherwise not be
involved.)

[acolwell GONE FROM CHROMIUM, 2014-03-11 19:07:21]

lgtm

[philipj_slow, 2014-03-12 00:45:49]

The CQ bit was checked by philipj@opera.com

[commit-bot: I haz the power, 2014-03-12 00:47:35]

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

[commit-bot: I haz the power, 2014-03-12 01:03:43]

Change committed as 168967