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

content/renderer/media/android/stream_texture_factory_android.h

 // Copyright 2013 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.
 
-#ifndef WEBKIT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_ANDROID_H_
-#define WEBKIT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_ANDROID_H_
+#ifndef CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_ANDROID_H_
+#define CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_ANDROID_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/layers/video_frame_provider.h"
 
-namespace webkit_media {
+namespace content {
 
 // The proxy class for the gpu thread to notify the compositor thread
 // when a new video frame is available.
 class StreamTextureProxy {
  public:
   // Initialize and bind to the current thread, which becomes the thread that
   // a connected client will receive callbacks on.
   virtual void BindToCurrentThread(int stream_id, int width, int height) = 0;
 
   virtual bool IsBoundToThread() = 0;
 
   // Setting the target for callback when a frame is available. This function
   // could be called on both the main thread and the compositor thread.
   virtual void SetClient(cc::VideoFrameProvider::Client* client) = 0;
 
   struct Deleter {
     inline void operator()(StreamTextureProxy* ptr) const { ptr->Release(); }

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

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.

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

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

   };
 
  protected:
   virtual ~StreamTextureProxy() {}
 
   // Causes this instance to be deleted on the thread it is bound to.
   virtual void Release() = 0;
 };
 
 typedef scoped_ptr<StreamTextureProxy, StreamTextureProxy::Deleter>
@@ skipping 13 matching lines @@
   // the player_id.
   virtual void EstablishPeer(int stream_id, int player_id) = 0;
 
   // Create the streamTexture and return the stream Id and set the texture id.
   virtual unsigned CreateStreamTexture(unsigned* texture_id) = 0;
 
   // Destroy the streamTexture for the given texture Id.
   virtual void DestroyStreamTexture(unsigned texture_id) = 0;
 };
 
-} // namespace webkit_media
+} // namespace content
 
-#endif  // WEBKIT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_ANDROID_H_
+#endif  // CONTENT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_ANDROID_H_