Move creation of MediaStream renders from MediaStreamImpl to MediaStreamRenderFactory

content/renderer/media/media_stream_renderer_factory.h

Index: content/renderer/media/media_stream_renderer_factory.h
diff --git a/content/renderer/media/media_stream_client.h b/content/renderer/media/media_stream_renderer_factory.h
similarity index 34%
rename from content/renderer/media/media_stream_client.h
rename to content/renderer/media/media_stream_renderer_factory.h
index 01b4233354588ee691657f64f5a6400ad7d94134..eb07e1cae4f0dc9459538d3b3afaeb245b1fcf63 100644
--- a/content/renderer/media/media_stream_client.h
+++ b/content/renderer/media/media_stream_renderer_factory.h
@@ -1,39 +1,42 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CLIENT_H_
-#define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CLIENT_H_
+#ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_RENDERER_FACTORY_H_
+#define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_RENDERER_FACTORY_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
+#include "content/common/content_export.h"
+#include "content/renderer/media/media_stream_audio_renderer.h"
 #include "content/renderer/media/video_frame_provider.h"
-
-class GURL;
+#include "url/gurl.h"
 
 namespace content {
 
-class MediaStreamAudioRenderer;
-
-// Define an interface for media stream client to get some information about
-// the media stream.
-class MediaStreamClient {
+// MediaStreamRendererFactory is used by WebMediaPlayerMS to create audio and
+// video feeds from a MediaStream provided an URL.
+// The factory methods are virtual in order for blink layouttests to be able to
+// override them.
+class CONTENT_EXPORT MediaStreamRendererFactory {
  public:
-  // Check if the |url| is derived from a media stream object.
-  virtual bool IsMediaStream(const GURL& url) = 0;
+  MediaStreamRendererFactory();
+  virtual ~MediaStreamRendererFactory();
 
   virtual scoped_refptr<VideoFrameProvider> GetVideoFrameProvider(
       const GURL& url,
       const base::Closure& error_cb,
-      const VideoFrameProvider::RepaintCB& repaint_cb) = 0;
+      const VideoFrameProvider::RepaintCB& repaint_cb);
 
   virtual scoped_refptr<MediaStreamAudioRenderer> GetAudioRenderer(
-      const GURL& url, int render_frame_id) = 0;
+      const GURL& url,
+      int render_view_id,
+      int render_frame_id);
 
- protected:
-  virtual ~MediaStreamClient() {}
+ private:
+  DISALLOW_COPY_AND_ASSIGN(MediaStreamRendererFactory);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_CLIENT_H_
+#endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_RENDERER_FACTORY_H_