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

content/renderer/media/stream_texture_factory_impl_android.cc

Index: content/renderer/media/stream_texture_factory_impl_android.cc
diff --git a/content/renderer/media/stream_texture_factory_impl_android.cc b/content/renderer/media/stream_texture_factory_impl_android.cc
index b33c9246628f5f071fc8a06a2a36acce8b6c7220..cb2408ba16b1125b8bf42537845b9f3d115dc322 100644
--- a/content/renderer/media/stream_texture_factory_impl_android.cc
+++ b/content/renderer/media/stream_texture_factory_impl_android.cc
@@ -20,7 +20,7 @@ namespace {
 // Implementation of the StreamTextureProxy class. This class listens to all
 // the stream texture updates and forward them to the
 // cc::VideoFrameProvider::Client.
-class StreamTextureProxyImpl : public webkit_media::StreamTextureProxy,
+class StreamTextureProxyImpl : public content::StreamTextureProxy,

[qinmin, 2013/06/21 04:37:05]

see my earlier comments, we can just rename this to StreamTextureProxy now and
remove the inheritance

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

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

                                public content::StreamTextureHost::Listener {
  public:
   explicit StreamTextureProxyImpl(content::StreamTextureHost* host);
@@ -104,7 +104,7 @@ StreamTextureFactoryImpl::StreamTextureFactoryImpl(
 StreamTextureFactoryImpl::~StreamTextureFactoryImpl() {
 }
 
-webkit_media::StreamTextureProxy* StreamTextureFactoryImpl::CreateProxy() {
+StreamTextureProxy* StreamTextureFactoryImpl::CreateProxy() {
   DCHECK(channel_.get());
   StreamTextureHost* host = new StreamTextureHost(channel_.get());
   return new StreamTextureProxyImpl(host);