Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2632)

Unified Diff: content/renderer/media/media_stream_impl_unittest.cc

Issue 9699069: Adding JSEP PeerConnection glue. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Deleting two renamed files. Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..fdbd538137cd2dc7ebcc86d7e93f7461bbf0556b 100644
--- a/content/renderer/media/media_stream_impl_unittest.cc
+++ b/content/renderer/media/media_stream_impl_unittest.cc
@@ -8,6 +8,7 @@
#include "content/renderer/media/mock_media_stream_dependency_factory.h"
#include "content/renderer/media/mock_media_stream_dispatcher.h"
#include "content/renderer/media/mock_web_peer_connection_handler_client.h"
+#include "content/renderer/media/peer_connection_handler.h"
#include "content/renderer/media/video_capture_impl_manager.h"
#include "content/renderer/p2p/socket_dispatcher.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -38,9 +39,54 @@ 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<PeerConnectionHandlerBase*>(pc_handler));
+ EXPECT_TRUE(ms_impl->peer_connection_handlers_.empty());
delete pc_handler;
+
+ // TODO(grunell): JSEP.
+}
+
+// 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.
+
+ // TODO(grunell): JSEP.
+
+ 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(
+ static_cast<PeerConnectionHandler*>(pc_handler1));
+ EXPECT_EQ(1u, ms_impl->peer_connection_handlers_.size());
+ delete pc_handler1;
+ ms_impl->ClosePeerConnection(
+ static_cast<PeerConnectionHandler*>(pc_handler2));
+ EXPECT_TRUE(ms_impl->peer_connection_handlers_.empty());
+ delete pc_handler2;
}

Powered by Google App Engine
This is Rietveld 408576698