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

content/renderer/media/stream_texture_factory_impl_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/stream_texture_factory_impl_android.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/synchronization/lock.h"
 #include "content/common/android/surface_texture_peer.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/renderer/render_thread_impl.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
 #include "ui/gfx/size.h"
 
 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);
   virtual ~StreamTextureProxyImpl() {}
 
   // webkit_media::StreamTextureProxy implementation:
   virtual void BindToCurrentThread(
       int stream_id, int width, int height) OVERRIDE;
   virtual bool IsBoundToThread() OVERRIDE { return !!loop_.get(); }
   virtual void SetClient(cc::VideoFrameProvider::Client* client) OVERRIDE;
@@ skipping 63 matching lines @@
     : context_(context),
       channel_(channel),
       view_id_(view_id) {
   DCHECK(context_);
   DCHECK(channel);
 }
 
 StreamTextureFactoryImpl::~StreamTextureFactoryImpl() {
 }
 
-webkit_media::StreamTextureProxy* StreamTextureFactoryImpl::CreateProxy() {
+StreamTextureProxy* StreamTextureFactoryImpl::CreateProxy() {
   DCHECK(channel_.get());
   StreamTextureHost* host = new StreamTextureHost(channel_.get());
   return new StreamTextureProxyImpl(host);
 }
 
 void StreamTextureFactoryImpl::EstablishPeer(int stream_id, int player_id) {
   DCHECK(channel_.get());
   channel_->Send(new GpuChannelMsg_EstablishStreamTexture(
       stream_id, view_id_, player_id));
 }
@@ skipping 10 matching lines @@
 
 void StreamTextureFactoryImpl::DestroyStreamTexture(unsigned texture_id) {
   if (context_->makeContextCurrent()) {
     context_->destroyStreamTextureCHROMIUM(texture_id);
     context_->deleteTexture(texture_id);
     context_->flush();
   }
 }
 
 }  // namespace content