Adding support for MediaStream and PeerConnection functionality

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 79d2a40aec61ba4deb37171522bdae048db010e4..5094c8c7a8ccdb2931e074a8dff64f6058668e59 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -56,6 +56,8 @@
 #include "content/renderer/load_progress_tracker.h"
 #include "content/renderer/media/audio_message_filter.h"
 #include "content/renderer/media/audio_renderer_impl.h"
+#include "content/renderer/media/media_stream_dependency_factory.h"
+#include "content/renderer/media/media_stream_dispatcher.h"
 #include "content/renderer/media/media_stream_impl.h"
 #include "content/renderer/media/render_media_log.h"
 #include "content/renderer/mhtml_generator.h"
@@ -339,6 +341,7 @@ RenderViewImpl::RenderViewImpl(gfx::NativeViewId parent_hwnd,
       geolocation_dispatcher_(NULL),
       speech_input_dispatcher_(NULL),
       device_orientation_dispatcher_(NULL),
+      media_stream_dispatcher_(NULL),
       p2p_socket_dispatcher_(NULL),
       devtools_agent_(NULL),
       renderer_accessibility_(NULL),
@@ -393,7 +396,8 @@ RenderViewImpl::RenderViewImpl(gfx::NativeViewId parent_hwnd,
   host_window_ = parent_hwnd;
 
 #if defined(ENABLE_P2P_APIS)
-  p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this);
+  if (!p2p_socket_dispatcher_)
+    p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this);
 #endif
 
   new MHTMLGenerator(this);
@@ -405,12 +409,6 @@ RenderViewImpl::RenderViewImpl(gfx::NativeViewId parent_hwnd,
 
   renderer_accessibility_ = new RendererAccessibility(this);
 
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  if (command_line.HasSwitch(switches::kEnableMediaStream)) {
-    media_stream_impl_ = new MediaStreamImpl(
-        RenderThreadImpl::current()->video_capture_impl_manager());
-  }
-
   content::GetContentClient()->renderer()->RenderViewCreated(this);
 }
 
@@ -4468,6 +4466,29 @@ WebKit::WebDeviceOrientationClient* RenderViewImpl::deviceOrientationClient() {
   return device_orientation_dispatcher_;
 }
 
+WebKit::WebMediaStreamClient* RenderView::mediaStreamClient() {
+  // TODO(grunell): Should be under media_stream flag here.
+#if defined(ENABLE_P2P_APIS)
+  if (!p2p_socket_dispatcher_)
+    p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this);
+#endif
+
+  if (!media_stream_dispatcher_)
+    media_stream_dispatcher_ = new MediaStreamDispatcher(this);
+
+  MediaStreamDependencyFactory* factory = new MediaStreamDependencyFactory();
+
+  if (!media_stream_impl_.get()) {
+    media_stream_impl_ = new MediaStreamImpl(
+        media_stream_dispatcher_,
+        p2p_socket_dispatcher_,
+        RenderThreadImpl::current()->video_capture_impl_manager(),
+        factory);
+  }
+  return media_stream_impl_.get();
+}
+
+
 void RenderViewImpl::zoomLimitsChanged(double minimum_level,
                                        double maximum_level) {
   // For now, don't remember plugin zoom values.  We don't want to mix them with