Remove WebVideoFrame, WebVideoFrameProvider, and WebVideoLayer.

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 dffcb8b2c3daab74204813a4252aab2b6e642c68..6fc3591dc54ecff7d4b094427972b4a2abf78b4a 100644
--- a/webkit/media/android/stream_texture_factory_android.h
+++ b/webkit/media/android/stream_texture_factory_android.h
@@ -6,11 +6,6 @@
 #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;
-}
 
 namespace webkit_media {
 
@@ -28,11 +23,7 @@ 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
 };