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

content/renderer/media/stream_texture_factory_impl_android.h

Index: content/renderer/media/stream_texture_factory_impl_android.h
diff --git a/content/renderer/media/stream_texture_factory_impl_android.h b/content/renderer/media/stream_texture_factory_impl_android.h
index 4c020725d457b83968a950174e748a3e22d95277..06d3a4c08f396f6a3a7d5b1873aa7ec19e9e1258 100644
--- a/content/renderer/media/stream_texture_factory_impl_android.h
+++ b/content/renderer/media/stream_texture_factory_impl_android.h
@@ -7,7 +7,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "content/renderer/gpu/stream_texture_host_android.h"
-#include "webkit/renderer/media/android/stream_texture_factory_android.h"
+#include "content/renderer/media/android/stream_texture_factory_android.h"
 
 namespace WebKit {
 class WebGraphicsContext3D;
@@ -17,8 +17,7 @@ namespace content {
 class GpuChannelHost;
 
 // The acutal implementation of StreamTextureFactory class.
-class StreamTextureFactoryImpl
-    : public webkit_media::StreamTextureFactory {
+class StreamTextureFactoryImpl : public content::StreamTextureFactory {

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

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]

Folded like my laundry.

  public:
   StreamTextureFactoryImpl(WebKit::WebGraphicsContext3D* context,
                            GpuChannelHost* channel,
@@ -26,7 +25,7 @@ class StreamTextureFactoryImpl
   virtual ~StreamTextureFactoryImpl();
 
   // webkit_media::StreamTextureFactory implementation:
-  virtual webkit_media::StreamTextureProxy* CreateProxy() OVERRIDE;
+  virtual StreamTextureProxy* CreateProxy() OVERRIDE;
 
   virtual void EstablishPeer(int stream_id, int player_id) OVERRIDE;