Adding JSEP PeerConnection glue.

content/renderer/media/media_stream_impl.cc

Index: content/renderer/media/media_stream_impl.cc
diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc
index a52a4ffdc4e36fef6e7911a4313e8329800bfe34..f04ee0b36ba8f38347a5f40a0e795c34868d0142 100644
--- a/content/renderer/media/media_stream_impl.cc
+++ b/content/renderer/media/media_stream_impl.cc
@@ -14,6 +14,7 @@
 #include "content/renderer/media/media_stream_dependency_factory.h"
 #include "content/renderer/media/media_stream_dispatcher.h"
 #include "content/renderer/media/peer_connection_handler.h"
+#include "content/renderer/media/peer_connection_handler_jsep.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
 #include "content/renderer/media/video_capture_module_impl.h"
 #include "content/renderer/media/webrtc_audio_device_impl.h"
@@ -118,12 +119,33 @@ WebKit::WebPeerConnectionHandler* MediaStreamImpl::CreatePeerConnectionHandler(
   if (!EnsurePeerConnectionFactory())
     return NULL;
 
-  peer_connection_handler_ = new PeerConnectionHandler(
+  PeerConnectionHandler* pc_handler = new PeerConnectionHandler(
+          client,

[tommi (sloooow) - chröme, 2012/03/15 12:31:52]

strange indent. run lint?

[Henrik Grunell, 2012/03/23 12:50:45]

Done.

+          this,
+          dependency_factory_.get());
+
+  peer_connection_handler_ = pc_handler;
+  return pc_handler;
+}
+
+WebKit::WebJSEPPeerConnectionHandler*
+MediaStreamImpl::CreatePeerConnectionHandlerJsep(
+    WebKit::WebJSEPPeerConnectionHandlerClient* client) {
+  DCHECK(CalledOnValidThread());
+  if (peer_connection_handler_) {
+    DVLOG(1) << "A PeerConnection already exists";
+    return NULL;
+  }
+  if (!EnsurePeerConnectionFactory())
+    return NULL;
+
+  PeerConnectionHandlerJsep* pc_handler = new PeerConnectionHandlerJsep(
       client,
       this,
       dependency_factory_.get());
 
-  return peer_connection_handler_;
+  peer_connection_handler_ = pc_handler;
+  return pc_handler;
 }
 
 void MediaStreamImpl::ClosePeerConnection() {