Move webkit/renderer/media/android/ to content/renderer/media/android/.

Move webkit/renderer/media/android/ to content/renderer/media/android/.

In addition:
  - MediaInfoLoader was moved to the android subdirectory as its only used on Android.
  - ProxyDecryptor was modified to accept a MediaKeys object instead of creating one itself.
  - StreamTexture{Factory,Proxy}Impl was folded into StreamTexture{Factory,Proxy}.
  - WebMediaPlayerProxyAndroidImpl was folded into WebMediaPlayerProxyAndroid.

BUG=251306
TBR=jochen

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=208040

[scherkus (not reviewing), 2013-06-21 02:52:58]

jamesr: everything 
qinmin: everything
xhwang: ProxyDecryptor

This was the smallest chunk I could split off. After this lands we can delete a
layer of two of abstraction in the Android code path.

Sadly I discovered that some parts of webkit/renderer/media/ have dependencies
outside the content module (e.g., chrome/, content/shell/). That'll take some
time to detangle :(

[xhwang, 2013-06-21 03:37:00]

ProxyDecryptor lgtm

[qinmin, 2013-06-21 04:37:04]

https://codereview.chromium.org/17502007/diff/4001/content/renderer/media/and...
File content/renderer/media/android/stream_texture_factory_android.h (right):

https://codereview.chromium.org/17502007/diff/4001/content/renderer/media/and...
content/renderer/media/android/stream_texture_factory_android.h:28: inline void
operator()(StreamTextureProxy* ptr) const { ptr->Release(); }
Other than this deleter struct, we don't need these 2 interfaces anymore. These
2 interfaces exists to bridge calls between content/ and webkit/. Since now we
are all in content/, we can just remove these 2 interfaces and rename the Impl
classes.

https://codereview.chromium.org/17502007/diff/4001/content/renderer/media/aud...
File content/renderer/media/audio_decoder.h (right):

https://codereview.chromium.org/17502007/diff/4001/content/renderer/media/aud...
content/renderer/media/audio_decoder.h:5: #ifndef
CONTENT_RENDERER_MEDIA_AUDIO_DECODER_ANDROID_H_
s/CONTENT_RENDERER_MEDIA_AUDIO_DECODER_ANDROID_H_/CONTENT_RENDERER_MEDIA_AUDIO_DECODER_H_/

https://codereview.chromium.org/17502007/diff/4001/content/renderer/media/aud...
content/renderer/media/audio_decoder.h:22: #if defined(OS_ANDROID)
this file is purely for android,  i think it can be moved to
content/renderer/media/android now

https://codereview.chromium.org/17502007/diff/4001/content/renderer/media/str...
File content/renderer/media/stream_texture_factory_impl_android.cc (right):

https://codereview.chromium.org/17502007/diff/4001/content/renderer/media/str...
content/renderer/media/stream_texture_factory_impl_android.cc:23: class
StreamTextureProxyImpl : public content::StreamTextureProxy,
see my earlier comments, we can just rename this to StreamTextureProxy now and
remove the inheritance

https://codereview.chromium.org/17502007/diff/4001/content/renderer/media/web...
File content/renderer/media/webmediaplayer_proxy_impl_android.h (right):

https://codereview.chromium.org/17502007/diff/4001/content/renderer/media/web...
content/renderer/media/webmediaplayer_proxy_impl_android.h:22: class
WebMediaPlayerProxyImplAndroid
same here, rename to WebMediaPlayerProxyAndroid, and no need for inheritance

https://codereview.chromium.org/17502007/diff/4001/webkit/renderer/media/webk...
File webkit/renderer/media/webkit_media.gypi (right):

https://codereview.chromium.org/17502007/diff/4001/webkit/renderer/media/webk...
webkit/renderer/media/webkit_media.gypi:100:
'<(DEPTH)/media/media.gyp:player_android',
remove this?

https://codereview.chromium.org/17502007/diff/4001/webkit/renderer/media/webk...
webkit/renderer/media/webkit_media.gypi:102: }, { # OS != "android"'
this is also not needed

[jamesr, 2013-06-21 04:55:35]

Looks like qinmin covered this pretty well!  I would like to subscribe to your
newsletter.

https://codereview.chromium.org/17502007/diff/4001/content/renderer/media/str...
File content/renderer/media/stream_texture_factory_impl_android.h (right):

https://codereview.chromium.org/17502007/diff/4001/content/renderer/media/str...
content/renderer/media/stream_texture_factory_impl_android.h:20: class
StreamTextureFactoryImpl : public content::StreamTextureFactory {
this is in namespace content, no need for the "content::"

are there other implementations of StreamTextureFactory or can we just fold this
into the base class?

[scherkus (not reviewing), 2013-06-21 21:37:59]

PTAL

https://codereview.chromium.org/17502007/diff/4001/content/renderer/media/and...
File content/renderer/media/android/stream_texture_factory_android.h (right):

https://codereview.chromium.org/17502007/diff/4001/content/renderer/media/and...
content/renderer/media/android/stream_texture_factory_android.h:28: inline void
operator()(StreamTextureProxy* ptr) const { ptr->Release(); }
On 2013/06/21 04:37:05, qinmin wrote:
> Other than this deleter struct, we don't need these 2 interfaces anymore.
These
> 2 interfaces exists to bridge calls between content/ and webkit/. Since now we
> are all in content/, we can just remove these 2 interfaces and rename the Impl
> classes.

Yeah was going to defer to a future CL but I'll tackle it now.

https://codereview.chromium.org/17502007/diff/4001/content/renderer/media/aud...
File content/renderer/media/audio_decoder.h (right):

https://codereview.chromium.org/17502007/diff/4001/content/renderer/media/aud...
content/renderer/media/audio_decoder.h:5: #ifndef
CONTENT_RENDERER_MEDIA_AUDIO_DECODER_ANDROID_H_
On 2013/06/21 04:37:05, qinmin wrote:
>
s/CONTENT_RENDERER_MEDIA_AUDIO_DECODER_ANDROID_H_/CONTENT_RENDERER_MEDIA_AUDIO_DECODER_H_/

Done.

https://codereview.chromium.org/17502007/diff/4001/content/renderer/media/aud...
content/renderer/media/audio_decoder.h:22: #if defined(OS_ANDROID)
On 2013/06/21 04:37:05, qinmin wrote:
> this file is purely for android,  i think it can be moved to
> content/renderer/media/android now

The other webkit/renderer/media/audio_decoder.h file will move eventually ...
but I'll move this for now

https://codereview.chromium.org/17502007/diff/4001/content/renderer/media/str...
File content/renderer/media/stream_texture_factory_impl_android.cc (right):

https://codereview.chromium.org/17502007/diff/4001/content/renderer/media/str...
content/renderer/media/stream_texture_factory_impl_android.cc:23: class
StreamTextureProxyImpl : public content::StreamTextureProxy,
On 2013/06/21 04:37:05, qinmin wrote:
> see my earlier comments, we can just rename this to StreamTextureProxy now and
> remove the inheritance

I was going to defer that to another CL but I really really really want to see
these classes combined :)

https://codereview.chromium.org/17502007/diff/4001/content/renderer/media/str...
File content/renderer/media/stream_texture_factory_impl_android.h (right):

https://codereview.chromium.org/17502007/diff/4001/content/renderer/media/str...
content/renderer/media/stream_texture_factory_impl_android.h:20: class
StreamTextureFactoryImpl : public content::StreamTextureFactory {
On 2013/06/21 04:55:35, jamesr wrote:
> this is in namespace content, no need for the "content::"
> 
> are there other implementations of StreamTextureFactory or can we just fold
this
> into the base class?

Folded like my laundry.

https://codereview.chromium.org/17502007/diff/4001/content/renderer/media/web...
File content/renderer/media/webmediaplayer_proxy_impl_android.h (right):

https://codereview.chromium.org/17502007/diff/4001/content/renderer/media/web...
content/renderer/media/webmediaplayer_proxy_impl_android.h:22: class
WebMediaPlayerProxyImplAndroid
On 2013/06/21 04:37:05, qinmin wrote:
> same here, rename to WebMediaPlayerProxyAndroid, and no need for inheritance

Done.

[qinmin, 2013-06-21 23:06:58]

lgtm

[jamesr, 2013-06-21 23:39:27]

lgtm. your laundry must end up less wrinkly than mine

[scherkus (not reviewing), 2013-06-22 00:04:26]

TBR=jochen for content/content_tests.gypi 

jamesr: you must be assuming this code is wrinkle-free cause I've definitely got
some wrinkly laundry going on :~(

[commit-bot: I haz the power, 2013-06-22 00:05:07]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/scherkus@chromium.org/17502007/34001

[commit-bot: I haz the power, 2013-06-22 00:40:32]

Sorry for I got bad news for ya.
Compile failed with a clobber build on android_clang_dbg.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_cl...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2013-06-22 02:48:55]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/scherkus@chromium.org/17502007/24004

[commit-bot: I haz the power, 2013-06-22 03:12:01]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/scherkus@chromium.org/17502007/24004

[commit-bot: I haz the power, 2013-06-22 04:43:06]

Retried try job too often on mac_rel for step(s) base_unittests, browser_tests,
cacheinvalidation_unittests, cc_unittests, check_deps, chromedriver2_unittests,
components_unittests, content_browsertests, content_unittests, crypto_unittests,
gpu_unittests, interactive_ui_tests, ipc_tests, jingle_unittests,
media_unittests, nacl_integration, net_unittests, ppapi_unittests,
printing_unittests, remoting_unittests, sql_unittests, sync_integration_tests,
sync_unit_tests, unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

[commit-bot: I haz the power, 2013-06-22 05:15:14]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/scherkus@chromium.org/17502007/24004

[commit-bot: I haz the power, 2013-06-22 14:32:50]

Change committed as 208040