Move WebMediaPlayerImpl and its dependencies to media/blink.

media/blink/video_frame_compositor.h

Index: media/blink/video_frame_compositor.h
diff --git a/content/renderer/media/video_frame_compositor.h b/media/blink/video_frame_compositor.h
similarity index 79%
rename from content/renderer/media/video_frame_compositor.h
rename to media/blink/video_frame_compositor.h
index 91e5d0cd17ef18260823402602b78a675549870f..9fc8b6a663decaf90e2e119cc7d6bf21b8291bbe 100644
--- a/content/renderer/media/video_frame_compositor.h
+++ b/media/blink/video_frame_compositor.h
@@ -2,20 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_RENDERER_MEDIA_VIDEO_FRAME_COMPOSITOR_H_
-#define CONTENT_RENDERER_MEDIA_VIDEO_FRAME_COMPOSITOR_H_
+#ifndef MEDIA_BLINK_VIDEO_FRAME_COMPOSITOR_H_
+#define MEDIA_BLINK_VIDEO_FRAME_COMPOSITOR_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "cc/layers/video_frame_provider.h"
-#include "content/common/content_export.h"
+#include "media/base/media_export.h"
 #include "ui/gfx/size.h"
 
 namespace media {
 class VideoFrame;
-}
-
-namespace content {
 
 // VideoFrameCompositor handles incoming frames by notifying the compositor and
 // dispatching callbacks when detecting changes in video frames.
@@ -25,7 +22,7 @@ namespace content {
 // changes in video frames and firing callbacks as needed.
 //
 // VideoFrameCompositor must live on the same thread as the compositor.
-class CONTENT_EXPORT VideoFrameCompositor
+class MEDIA_EXPORT VideoFrameCompositor
     : NON_EXPORTED_BASE(public cc::VideoFrameProvider) {
  public:
   // |natural_size_changed_cb| is run with the new natural size of the video
@@ -48,12 +45,12 @@ class CONTENT_EXPORT VideoFrameCompositor
   // cc::VideoFrameProvider implementation.
   virtual void SetVideoFrameProviderClient(
       cc::VideoFrameProvider::Client* client) OVERRIDE;
-  virtual scoped_refptr<media::VideoFrame> GetCurrentFrame() OVERRIDE;
+  virtual scoped_refptr<VideoFrame> GetCurrentFrame() OVERRIDE;
   virtual void PutCurrentFrame(
-      const scoped_refptr<media::VideoFrame>& frame) OVERRIDE;
+      const scoped_refptr<VideoFrame>& frame) OVERRIDE;
 
   // Updates the current frame and notifies the compositor.
-  void UpdateCurrentFrame(const scoped_refptr<media::VideoFrame>& frame);
+  void UpdateCurrentFrame(const scoped_refptr<VideoFrame>& frame);
 
  private:
   base::Callback<void(gfx::Size)> natural_size_changed_cb_;
@@ -61,11 +58,11 @@ class CONTENT_EXPORT VideoFrameCompositor
 
   cc::VideoFrameProvider::Client* client_;
 
-  scoped_refptr<media::VideoFrame> current_frame_;
+  scoped_refptr<VideoFrame> current_frame_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoFrameCompositor);
 };
 
-}  // namespace content
+}  // namespace media
 
-#endif  // CONTENT_RENDERER_MEDIA_VIDEO_FRAME_COMPOSITOR_H_
+#endif  // MEDIA_BLINK_VIDEO_FRAME_COMPOSITOR_H_