Move MediaStreamVideoRendererSink out of the Blink exposed API

BUG=704136,919392
R=guidou@chromium.org, haraken@chromium.org

Change-Id: Id08f26f45029023a6a2eab9f6df2d93f9108c8c1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1724552
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Cr-Commit-Position: refs/heads/master@{#682229}

third_party/blink/public/BUILD.gn

@@ -379,7 +379,6 @@ source_set("blink_headers") {
     "web/modules/mediastream/media_stream_constraints_util_video_content.h",
     "web/modules/mediastream/media_stream_constraints_util_video_device.h",
     "web/modules/mediastream/media_stream_video_capturer_source.h",
-    "web/modules/mediastream/media_stream_video_renderer_sink.h",
     "web/modules/mediastream/media_stream_video_sink.h",
     "web/modules/mediastream/media_stream_video_source.h",
     "web/modules/mediastream/media_stream_video_track.h",

third_party/blink/renderer/modules/mediastream/BUILD.gn

@@ -43,6 +43,7 @@ blink_modules_sources("mediastream") {
     "media_stream_track_event.h",
     "media_stream_video_capturer_source.cc",
     "media_stream_video_renderer_sink.cc",
+    "media_stream_video_renderer_sink.h",
     "media_stream_video_sink.cc",
     "media_stream_video_source.cc",
     "media_stream_video_track.cc",

third_party/blink/renderer/modules/mediastream/DEPS

@@ -40,6 +40,7 @@ include_rules = [
     "+third_party/blink/renderer/modules/imagecapture",
     "+third_party/blink/renderer/modules/mediastream",
     "+third_party/blink/renderer/modules/modules_export.h",
+    "+ui/gfx/geometry/size.h",
 ]
 
 specific_include_rules = {

third_party/blink/renderer/modules/mediastream/media_stream_renderer_factory_impl.cc

@@ -10,11 +10,11 @@
 #include "third_party/blink/public/platform/modules/webrtc/webrtc_logging.h"
 #include "third_party/blink/public/platform/platform.h"
 #include "third_party/blink/public/platform/web_media_stream.h"
-#include "third_party/blink/public/web/modules/mediastream/media_stream_video_renderer_sink.h"
 #include "third_party/blink/public/web/modules/mediastream/media_stream_video_track.h"
 #include "third_party/blink/public/web/modules/webrtc/webrtc_audio_device_impl.h"
 #include "third_party/blink/public/web/modules/webrtc/webrtc_audio_renderer.h"
 #include "third_party/blink/public/web/web_local_frame.h"
+#include "third_party/blink/renderer/modules/mediastream/media_stream_video_renderer_sink.h"
 #include "third_party/blink/renderer/modules/mediastream/track_audio_renderer.h"
 #include "third_party/blink/renderer/platform/webrtc/peer_connection_remote_audio_source.h"
 #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"

third_party/blink/renderer/modules/mediastream/media_stream_video_renderer_sink.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "third_party/blink/public/web/modules/mediastream/media_stream_video_renderer_sink.h"
+#include "third_party/blink/renderer/modules/mediastream/media_stream_video_renderer_sink.h"
 
 #include <utility>
 

third_party/blink/public/web/modules/mediastream/media_stream_video_renderer_sink.h → third_party/blink/renderer/modules/mediastream/media_stream_video_renderer_sink.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef THIRD_PARTY_BLINK_PUBLIC_WEB_MODULES_MEDIASTREAM_MEDIA_STREAM_VIDEO_RENDERER_SINK_H_
-#define THIRD_PARTY_BLINK_PUBLIC_WEB_MODULES_MEDIASTREAM_MEDIA_STREAM_VIDEO_RENDERER_SINK_H_
+#ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_MEDIASTREAM_MEDIA_STREAM_VIDEO_RENDERER_SINK_H_
+#define THIRD_PARTY_BLINK_RENDERER_MODULES_MEDIASTREAM_MEDIA_STREAM_VIDEO_RENDERER_SINK_H_
 
 #include "base/callback.h"
 #include "base/macros.h"
@@ -11,9 +11,9 @@
 #include "base/threading/thread_checker.h"
 #include "third_party/blink/public/common/media/video_capture.h"
 #include "third_party/blink/public/platform/modules/mediastream/web_media_stream_video_renderer.h"
-#include "third_party/blink/public/platform/web_common.h"
 #include "third_party/blink/public/platform/web_media_stream_track.h"
 #include "third_party/blink/public/web/modules/mediastream/media_stream_video_sink.h"
+#include "third_party/blink/renderer/modules/modules_export.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace base {
@@ -22,7 +22,7 @@ class SingleThreadTaskRunner;
 
 namespace blink {
 
-// MediaStreamVideoRendererSink is a blink::WebMediaStreamVideoRenderer designed
+// MediaStreamVideoRendererSink is a WebMediaStreamVideoRenderer designed
 // for rendering Video MediaStreamTracks [1], MediaStreamVideoRendererSink
 // implements MediaStreamVideoSink in order to render video frames provided from
 // a MediaStreamVideoTrack, to which it connects itself when the
@@ -34,17 +34,17 @@ namespace blink {
 // TODO(wuchengli): Add unit test. See the link below for reference.
 // https://src.chromium.org/viewvc/chrome/trunk/src/content/renderer/media/rtc_
 // video_decoder_unittest.cc?revision=180591&view=markup
-class BLINK_MODULES_EXPORT MediaStreamVideoRendererSink
-    : public blink::WebMediaStreamVideoRenderer,
-      public blink::MediaStreamVideoSink {
+class MODULES_EXPORT MediaStreamVideoRendererSink
+    : public WebMediaStreamVideoRenderer,
+      public MediaStreamVideoSink {
  public:
   MediaStreamVideoRendererSink(
-      const blink::WebMediaStreamTrack& video_track,
-      const blink::WebMediaStreamVideoRenderer::RepaintCB& repaint_cb,
+      const WebMediaStreamTrack& video_track,
+      const WebMediaStreamVideoRenderer::RepaintCB& repaint_cb,
       scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
       scoped_refptr<base::SingleThreadTaskRunner> main_render_task_runner);
 
-  // blink::WebMediaStreamVideoRenderer implementation. Called on the main
+  // WebMediaStreamVideoRenderer implementation. Called on the main
   // thread.
   void Start() override;
   void Stop() override;
@@ -63,14 +63,13 @@ class BLINK_MODULES_EXPORT MediaStreamVideoRendererSink
   };
 
   // MediaStreamVideoSink implementation. Called on the main thread.
-  void OnReadyStateChanged(
-      blink::WebMediaStreamSource::ReadyState state) override;
+  void OnReadyStateChanged(WebMediaStreamSource::ReadyState state) override;
 
   // Helper method used for testing.
   State GetStateForTesting();
 
   const RepaintCB repaint_cb_;
-  const blink::WebMediaStreamTrack video_track_;
+  const WebMediaStreamTrack video_track_;
 
   // Inner class used for transfering frames on compositor thread and running
   // |repaint_cb_|.
@@ -89,4 +88,4 @@ class BLINK_MODULES_EXPORT MediaStreamVideoRendererSink
 
 }  // namespace blink
 
-#endif  // THIRD_PARTY_BLINK_PUBLIC_WEB_MODULES_MEDIASTREAM_MEDIA_STREAM_VIDEO_RENDERER_SINK_H_
+#endif  // THIRD_PARTY_BLINK_RENDERER_MODULES_MEDIASTREAM_MEDIA_STREAM_VIDEO_RENDERER_SINK_H_

third_party/blink/renderer/modules/mediastream/media_stream_video_renderer_sink_test.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "third_party/blink/public/web/modules/mediastream/media_stream_video_renderer_sink.h"
+#include "third_party/blink/renderer/modules/mediastream/media_stream_video_renderer_sink.h"
 
 #include <memory>