Adding support for MediaStream and PeerConnection functionality.

content/renderer/render_view.cc

Index: content/renderer/render_view.cc
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc
index 46e03c043515ae399335e64f52a06fadd17eb12a..d498ac5989bb102af05660db2e7ef234997cf386 100644
--- a/content/renderer/render_view.cc
+++ b/content/renderer/render_view.cc
@@ -52,6 +52,7 @@
 #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_dispatcher.h"
 #include "content/renderer/media/media_stream_impl.h"
 #include "content/renderer/media/render_media_log.h"
 #include "content/renderer/navigation_state.h"
@@ -386,6 +387,7 @@ RenderView::RenderView(RenderThreadBase* render_thread,
       geolocation_dispatcher_(NULL),
       speech_input_dispatcher_(NULL),
       device_orientation_dispatcher_(NULL),
+      media_stream_dispatcher_(NULL),
       accessibility_ack_pending_(false),
       accessibility_logging_(false),
       p2p_socket_dispatcher_(NULL),
@@ -452,11 +454,6 @@ RenderView::RenderView(RenderThreadBase* render_thread,
 
   devtools_agent_ = new DevToolsAgent(this);
 
-  if (command_line.HasSwitch(switches::kEnableMediaStream)) {
-    media_stream_impl_ = new MediaStreamImpl(
-        RenderThread::current()->video_capture_impl_manager());
-  }
-
   content::GetContentClient()->renderer()->RenderViewCreated(this);
 }
 
@@ -4454,6 +4451,22 @@ WebKit::WebDeviceOrientationClient* RenderView::deviceOrientationClient() {
   return device_orientation_dispatcher_;
 }
 
+WebKit::WebMediaStreamClient* RenderView::mediaStreamClient() {
+#if defined(ENABLE_P2P_APIS)
+  p2p_socket_dispatcher_ = new content::P2PSocketDispatcher(this);
+#endif
+
+  if (!media_stream_dispatcher_)
+    media_stream_dispatcher_ = new MediaStreamDispatcher(this);
+
+  if (!media_stream_impl_.get())

[tommi (sloooow) - chröme, 2011/09/23 13:02:42]

braces.  basically the only time chromium doesn't use braces for if statements
is when they span only two lines.

[grunell (dont use), 2011/09/29 13:38:17]

Done.

+    media_stream_impl_ = new MediaStreamImpl(
+        media_stream_dispatcher_,
+        p2p_socket_dispatcher_,
+        RenderThread::current()->video_capture_impl_manager());
+  return media_stream_impl_.get();
+}
+
 void RenderView::zoomLimitsChanged(double minimum_level, double maximum_level) {
   // For now, don't remember plugin zoom values.  We don't want to mix them with
   // normal web content (i.e. a fixed layout plugin would usually want them