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

webkit/renderer/media/android/stream_texture_factory_android.h

Index: webkit/renderer/media/android/stream_texture_factory_android.h
diff --git a/webkit/renderer/media/android/stream_texture_factory_android.h b/webkit/renderer/media/android/stream_texture_factory_android.h
deleted file mode 100644
index a9aab0e6f4e58aa301fe8ff025a2848d80b93738..0000000000000000000000000000000000000000
--- a/webkit/renderer/media/android/stream_texture_factory_android.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// 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_
-
-#include "base/memory/scoped_ptr.h"
-#include "cc/layers/video_frame_provider.h"
-
-namespace webkit_media {
-
-// 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(); }
-  };
-
- 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>
-    ScopedStreamTextureProxy;
-
-// Factory class for managing the stream texture.
-class StreamTextureFactory {
- public:
-  virtual ~StreamTextureFactory() {}
-
-  // Create the StreamTextureProxy object.
-  virtual StreamTextureProxy* CreateProxy() = 0;
-
-  // Send an IPC message to the browser process to request a java surface
-  // object for the given stream_id. After the the surface is created,
-  // it will be passed back to the WebMediaPlayerAndroid object identified by
-  // 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
-
-#endif  // WEBKIT_RENDERER_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_ANDROID_H_