Cleanup naming issue with content::VideoFrameProvider

content/shell/renderer/layout_test/test_media_stream_video_renderer.h

Index: content/shell/renderer/layout_test/test_media_stream_video_renderer.h
diff --git a/content/shell/renderer/layout_test/test_video_frame_provider.h b/content/shell/renderer/layout_test/test_media_stream_video_renderer.h
similarity index 62%
rename from content/shell/renderer/layout_test/test_video_frame_provider.h
rename to content/shell/renderer/layout_test/test_media_stream_video_renderer.h
index 72b9d151050927b32741fae70c854fe3229365cb..8e17a309e55dc3b5f9c58e29a7bbfab227919a5c 100644
--- a/content/shell/renderer/layout_test/test_video_frame_provider.h
+++ b/content/shell/renderer/layout_test/test_media_stream_video_renderer.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_SHELL_RENDERER_LAYOUT_TEST_TEST_VIDEO_FRAME_PROVIDER_H_
-#define CONTENT_SHELL_RENDERER_LAYOUT_TEST_TEST_VIDEO_FRAME_PROVIDER_H_
+#ifndef CONTENT_SHELL_RENDERER_LAYOUT_TEST_TEST_MEDIA_STREAM_VIDEO_RENDERER_H_
+#define CONTENT_SHELL_RENDERER_LAYOUT_TEST_TEST_MEDIA_STREAM_VIDEO_RENDERER_H_
 
 #include "base/macros.h"
 #include "base/time/time.h"
-#include "content/public/renderer/video_frame_provider.h"
+#include "content/public/renderer/media_stream_video_renderer.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace base {
@@ -16,27 +16,27 @@ class SingleThreadTaskRunner;
 
 namespace content {
 
-// A simple implementation of VideoFrameProvider generates raw frames and
+// A MediaStreamVideoRenderer that generates raw frames and
 // passes them to webmediaplayer.
 // Since non-black pixel values are required in the layout test, e.g.,
 // media/video-capture-canvas.html, this class should generate frame with
 // only non-black pixels.
-class TestVideoFrameProvider : public VideoFrameProvider {
+class TestMediaStreamVideoRenderer : public MediaStreamVideoRenderer {
  public:
-  TestVideoFrameProvider(
+  TestMediaStreamVideoRenderer(
       const gfx::Size& size,
       const base::TimeDelta& frame_duration,
       const base::Closure& error_cb,
       const RepaintCB& repaint_cb);
 
-  // VideoFrameProvider implementation.
+  // MediaStreamVideoRenderer implementation.
   void Start() override;
   void Stop() override;
-  void Play() override;
+  void Resume() override;
   void Pause() override;
 
  protected:
-  ~TestVideoFrameProvider() override;
+  ~TestMediaStreamVideoRenderer() override;
 
  private:
   enum State {
@@ -56,9 +56,9 @@ class TestVideoFrameProvider : public VideoFrameProvider {
   base::Closure error_cb_;
   RepaintCB repaint_cb_;
 
-  DISALLOW_COPY_AND_ASSIGN(TestVideoFrameProvider);
+  DISALLOW_COPY_AND_ASSIGN(TestMediaStreamVideoRenderer);
 };
 
-}  // namespace content
+} // namespace content
 
-#endif  // CONTENT_SHELL_RENDERER_LAYOUT_TEST_TEST_VIDEO_FRAME_PROVIDER_H_
+#endif // CONTENT_SHELL_RENDERER_LAYOUT_TEST_TEST_MEDIA_STREAM_VIDEO_RENDERER_H_