Move VideoFrameProvider to, and remove all usage of WebVideoFrame from cc/

content/browser/renderer_host/surface_texture_transport_client_android.h

 // 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_SURFACE_TEXTURE_TRANSPORT_CLIENT_ANDROID_H_
 #define CONTENT_BROWSER_RENDERER_HOST_SURFACE_TEXTURE_TRANSPORT_CLIENT_ANDROID_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebVideoFrameProvider.h"
+#include "cc/VideoFrameProvider.h"

[jamesr, 2013/01/03 23:35:55]

should be video_frame_provider.h, no?

[danakj, 2013/01/04 14:01:29]

er.. yeh.

 #include "ui/gfx/native_widget_types.h"
 
 struct ANativeWindow;
 
 namespace cc {
 class Layer;
 class VideoLayer;
 }
 
 namespace content {
 class SurfaceTextureBridge;
 
-class SurfaceTextureTransportClient : public WebKit::WebVideoFrameProvider {
+class SurfaceTextureTransportClient : public cc::VideoFrameProvider {
  public:
   SurfaceTextureTransportClient();
   virtual ~SurfaceTextureTransportClient();
 
   scoped_refptr<cc::Layer> Initialize();
   gfx::GLSurfaceHandle GetCompositingSurface(int surface_id);
   void SetSize(const gfx::Size& size);
 
-  // WebKit::WebVideoFrameProvider implementation.
-  virtual void setVideoFrameProviderClient(Client*) OVERRIDE {}
-  virtual WebKit::WebVideoFrame* getCurrentFrame() OVERRIDE;
-  virtual void putCurrentFrame(WebKit::WebVideoFrame* frame) OVERRIDE;
+  // cc::VideoFrameProvider implementation.
+  virtual void SetVideoFrameProviderClient(Client*) OVERRIDE {}
+  virtual media::VideoFrame* GetCurrentFrame() OVERRIDE;
+  virtual void PutCurrentFrame(media::VideoFrame* frame) OVERRIDE;
 
  private:
   void OnSurfaceTextureFrameAvailable();
 
   scoped_refptr<cc::VideoLayer> video_layer_;
   scoped_refptr<SurfaceTextureBridge> surface_texture_;
   ANativeWindow* window_;
-  scoped_ptr<WebKit::WebVideoFrame> video_frame_;
+  scoped_refptr<media::VideoFrame> video_frame_;
   uint32 texture_id_;
 
   DISALLOW_COPY_AND_ASSIGN(SurfaceTextureTransportClient);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_SURFACE_TEXTURE_TRANSPORT_CLIENT_ANDROID_H_