Move creation of MediaStream renders from MediaStreamImpl to MediaStreamRenderFactory

content/test/test_media_stream_renderer_factory.h

Index: content/test/test_media_stream_renderer_factory.h
diff --git a/content/test/test_media_stream_client.h b/content/test/test_media_stream_renderer_factory.h
similarity index 52%
rename from content/test/test_media_stream_client.h
rename to content/test/test_media_stream_renderer_factory.h
index 9f1e6d56b4aec3de6dd6e82f6b7612c9b1b96486..47509c09be93635849a45d438d17a344576c6174 100644
--- a/content/test/test_media_stream_client.h
+++ b/content/test/test_media_stream_renderer_factory.h
@@ -2,34 +2,34 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_TEST_TEST_MEDIA_STREAM_CLIENT_H_
-#define CONTENT_TEST_TEST_MEDIA_STREAM_CLIENT_H_
+#ifndef CONTENT_TEST_TEST_MEDIA_STREAM_RENDERER_FACTORY_H_
+#define CONTENT_TEST_TEST_MEDIA_STREAM_RENDERER_FACTORY_H_
 
 #include "base/callback_forward.h"
-#include "content/public/renderer/render_frame_observer.h"
-#include "content/renderer/media/media_stream_client.h"
+#include "content/renderer/media/media_stream_renderer_factory.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 
 namespace content {
 
 // TestMediaStreamClient is a mock implementation of MediaStreamClient used when
 // running layout tests.
-class TestMediaStreamClient : public RenderFrameObserver,
-                              public MediaStreamClient {
+class TestMediaStreamRendererFactory : public MediaStreamRendererFactory {
  public:
-  explicit TestMediaStreamClient(RenderFrame* render_frame);
-  virtual ~TestMediaStreamClient();
+  TestMediaStreamRendererFactory();
+  virtual ~TestMediaStreamRendererFactory();
 
-  // MediaStreamClient implementation.
-  virtual bool IsMediaStream(const GURL& url) OVERRIDE;
+  // MediaStreamRendererFactory implementation.
   virtual scoped_refptr<VideoFrameProvider> GetVideoFrameProvider(
       const GURL& url,
       const base::Closure& error_cb,
       const VideoFrameProvider::RepaintCB& repaint_cb) OVERRIDE;
+
   virtual scoped_refptr<MediaStreamAudioRenderer> GetAudioRenderer(
-      const GURL& url, int render_frame_id) OVERRIDE;
+      const GURL& url,
+      int render_view_id,
+      int render_frame_id) OVERRIDE;
 };
 
 }  // namespace content
 
-#endif  // CONTENT_TEST_TEST_MEDIA_STREAM_CLIENT_H_
+#endif  // CONTENT_TEST_TEST_MEDIA_STREAM_RENDERER_FACTORY_H_