Move creation of MediaStream renders from MediaStreamImpl to MediaStreamRenderFactory

content/renderer/media/webmediaplayer_ms.h

Index: content/renderer/media/webmediaplayer_ms.h
diff --git a/content/renderer/media/webmediaplayer_ms.h b/content/renderer/media/webmediaplayer_ms.h
index 4c1cdf2c2dc25fc18c70024a1a03bcaa885c1024..dfb6ed2b82134818899713e250817b15446c0dcf 100644
--- a/content/renderer/media/webmediaplayer_ms.h
+++ b/content/renderer/media/webmediaplayer_ms.h
@@ -11,6 +11,7 @@
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
 #include "cc/layers/video_frame_provider.h"
+#include "content/renderer/media/media_stream_renderer_factory.h"

[no longer working on chromium, 2014/05/27 12:30:36]

why not forward the declaration?

[perkj_chrome, 2014/05/27 13:27:03]

Done.

 #include "media/filters/skcanvas_video_renderer.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/platform/WebMediaPlayer.h"
@@ -31,7 +32,6 @@ class WebLayerImpl;
 
 namespace content {
 class MediaStreamAudioRenderer;
-class MediaStreamClient;
 class VideoFrameProvider;
 class WebMediaPlayerDelegate;
 
@@ -59,8 +59,8 @@ class WebMediaPlayerMS
   WebMediaPlayerMS(blink::WebFrame* frame,
                    blink::WebMediaPlayerClient* client,
                    base::WeakPtr<WebMediaPlayerDelegate> delegate,
-                   MediaStreamClient* media_stream_client,
-                   media::MediaLog* media_log);
+                   media::MediaLog* media_log,
+                   scoped_ptr<MediaStreamRendererFactory> factory);
   virtual ~WebMediaPlayerMS();
 
   virtual void load(LoadType load_type,
@@ -151,8 +151,6 @@ class WebMediaPlayerMS
 
   base::WeakPtr<WebMediaPlayerDelegate> delegate_;
 
-  MediaStreamClient* media_stream_client_;
-
   // Specify content:: to disambiguate from cc::.
   scoped_refptr<content::VideoFrameProvider> video_frame_provider_;
   bool paused_;
@@ -189,6 +187,8 @@ class WebMediaPlayerMS
 
   scoped_refptr<media::MediaLog> media_log_;
 
+  scoped_ptr<MediaStreamRendererFactory> renderer_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS);
 };