Move ownership of cc:VideoLayer to webkit/media

webkit/media/android/stream_texture_factory_android.h

Index: webkit/media/android/stream_texture_factory_android.h
diff --git a/webkit/media/android/stream_texture_factory_android.h b/webkit/media/android/stream_texture_factory_android.h
index 749e0bbe78b06c787347e08589663428d62231dc..dffcb8b2c3daab74204813a4252aab2b6e642c68 100644
--- a/webkit/media/android/stream_texture_factory_android.h
+++ b/webkit/media/android/stream_texture_factory_android.h
@@ -5,6 +5,9 @@
 #ifndef WEBKIT_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_ANDROID_H_
 #define WEBKIT_MEDIA_ANDROID_STREAM_TEXTURE_FACTORY_ANDROID_H_
 
+#include "cc/layers/video_frame_provider.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebVideoFrame.h"
+
 namespace WebKit {
 class WebStreamTextureClient;
 }
@@ -25,7 +28,11 @@ class StreamTextureProxy {
 
   // Setting the target for callback when a frame is available. This function
   // could be called on both the main thread and the compositor thread.
+#ifndef REMOVE_WEBVIDEOFRAME
   virtual void SetClient(WebKit::WebStreamTextureClient* client) = 0;
+#else
+  virtual void SetClient(cc::VideoFrameProvider::Client* client) = 0;
+#endif
 };