Support for multiple PeerConnections

content/renderer/media/media_stream_impl_unittest.cc

Index: content/renderer/media/media_stream_impl_unittest.cc
diff --git a/content/renderer/media/media_stream_impl_unittest.cc b/content/renderer/media/media_stream_impl_unittest.cc
index 110c69d2a478cd5e4826b587b026084cd01e1a39..69aa894b69d475efa36e75fa53f3d19adc5cda67 100644
--- a/content/renderer/media/media_stream_impl_unittest.cc
+++ b/content/renderer/media/media_stream_impl_unittest.cc
@@ -38,9 +38,50 @@ TEST(MediaStreamImplTest, DISABLED_Basic) {
   WebKit::MockWebPeerConnectionHandlerClient client;
   WebKit::WebPeerConnectionHandler* pc_handler =
       ms_impl->CreatePeerConnectionHandler(&client);
-  EXPECT_TRUE(ms_impl->peer_connection_handler_);
+  EXPECT_EQ(1u, ms_impl->peer_connection_handlers_.size());
 
-  ms_impl->ClosePeerConnection();
-  EXPECT_FALSE(ms_impl->peer_connection_handler_);
+  ms_impl->ClosePeerConnection(
+      reinterpret_cast<PeerConnectionHandler*>(pc_handler));
+  EXPECT_TRUE(ms_impl->peer_connection_handlers_.empty());
   delete pc_handler;
 }
+
+// Disabled due to http://crbug.com/112408 .
+TEST(MediaStreamImplTest, DISABLED_MultiplePeerConnections) {
+  MessageLoop loop;
+
+  // Create our test object.
+  scoped_ptr<MockMediaStreamDispatcher> ms_dispatcher(
+      new MockMediaStreamDispatcher());
+  scoped_ptr<content::P2PSocketDispatcher> p2p_socket_dispatcher(
+      new content::P2PSocketDispatcher(NULL));
+  scoped_refptr<VideoCaptureImplManager> vc_manager(
+      new VideoCaptureImplManager());
+  MockMediaStreamDependencyFactory* dependency_factory =
+      new MockMediaStreamDependencyFactory();
+  scoped_refptr<MediaStreamImpl> ms_impl(new MediaStreamImpl(
+      ms_dispatcher.get(),
+      p2p_socket_dispatcher.get(),
+      vc_manager.get(),
+      dependency_factory));
+
+  // TODO(grunell): Add tests for WebKit::WebUserMediaClient and
+  // MediaStreamDispatcherEventHandler implementations.
+
+  WebKit::MockWebPeerConnectionHandlerClient client;
+  WebKit::WebPeerConnectionHandler* pc_handler1 =
+      ms_impl->CreatePeerConnectionHandler(&client);
+  EXPECT_EQ(1u, ms_impl->peer_connection_handlers_.size());
+  WebKit::WebPeerConnectionHandler* pc_handler2 =
+      ms_impl->CreatePeerConnectionHandler(&client);
+  EXPECT_EQ(2u, ms_impl->peer_connection_handlers_.size());
+
+  ms_impl->ClosePeerConnection(
+      reinterpret_cast<PeerConnectionHandler*>(pc_handler1));

[tommi (sloooow) - chröme, 2012/02/29 13:37:00]

is reinterpret_cast right here?  It will cast the pointer directly without
regard of inheritance etc.  If WebPeerConnectionHandler is in any way related to
PeerConnectionHandler, then this should be static_cast... and if so, is the cast
even necessary?

[Henrik Grunell, 2012/03/23 12:51:56]

Interesting, don't know why I used reinterpret here. Must have forgotten it when
testing something during dev. Changed to static_cast; it's a base->derived cast.

+  EXPECT_EQ(1u, ms_impl->peer_connection_handlers_.size());
+  delete pc_handler1;

[tommi (sloooow) - chröme, 2012/02/29 13:37:00]

scoped_ptr?

[Henrik Grunell, 2012/03/23 12:51:56]

I wanted to mimic WebKit here by deleting explicitly directly after
ClosePeerConnection call. It actually doesn't matter for how the test looks
right now, but I prefer it if it's expanded.

+  ms_impl->ClosePeerConnection(
+      reinterpret_cast<PeerConnectionHandler*>(pc_handler2));

[tommi (sloooow) - chröme, 2012/02/29 13:37:00]

same here

[Henrik Grunell, 2012/03/23 12:51:56]

Done.

+  EXPECT_TRUE(ms_impl->peer_connection_handlers_.empty());
+  delete pc_handler2;

[tommi (sloooow) - chröme, 2012/02/29 13:37:00]

scoped_ptr?

[Henrik Grunell, 2012/03/23 12:51:56]

Same as above.

+}