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

Side by Side Diff: content/renderer/media/media_stream_impl_unittest.cc

Issue 9543001: Support for multiple PeerConnections (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "base/message_loop.h" 6 #include "base/message_loop.h"
7 #include "content/renderer/media/media_stream_impl.h" 7 #include "content/renderer/media/media_stream_impl.h"
8 #include "content/renderer/media/mock_media_stream_dependency_factory.h" 8 #include "content/renderer/media/mock_media_stream_dependency_factory.h"
9 #include "content/renderer/media/mock_media_stream_dispatcher.h" 9 #include "content/renderer/media/mock_media_stream_dispatcher.h"
10 #include "content/renderer/media/mock_web_peer_connection_handler_client.h" 10 #include "content/renderer/media/mock_web_peer_connection_handler_client.h"
(...skipping 20 matching lines...) Expand all
31 p2p_socket_dispatcher.get(), 31 p2p_socket_dispatcher.get(),
32 vc_manager.get(), 32 vc_manager.get(),
33 dependency_factory)); 33 dependency_factory));
34 34
35 // TODO(grunell): Add tests for WebKit::WebUserMediaClient and 35 // TODO(grunell): Add tests for WebKit::WebUserMediaClient and
36 // MediaStreamDispatcherEventHandler implementations. 36 // MediaStreamDispatcherEventHandler implementations.
37 37
38 WebKit::MockWebPeerConnectionHandlerClient client; 38 WebKit::MockWebPeerConnectionHandlerClient client;
39 WebKit::WebPeerConnectionHandler* pc_handler = 39 WebKit::WebPeerConnectionHandler* pc_handler =
40 ms_impl->CreatePeerConnectionHandler(&client); 40 ms_impl->CreatePeerConnectionHandler(&client);
41 EXPECT_TRUE(ms_impl->peer_connection_handler_); 41 EXPECT_EQ(1u, ms_impl->peer_connection_handlers_.size());
42 42
43 ms_impl->ClosePeerConnection(); 43 ms_impl->ClosePeerConnection(
44 EXPECT_FALSE(ms_impl->peer_connection_handler_); 44 reinterpret_cast<PeerConnectionHandler*>(pc_handler));
45 EXPECT_TRUE(ms_impl->peer_connection_handlers_.empty());
45 delete pc_handler; 46 delete pc_handler;
46 } 47 }
48
49 // Disabled due to http://crbug.com/112408 .
50 TEST(MediaStreamImplTest, DISABLED_MultiplePeerConnections) {
51 MessageLoop loop;
52
53 // Create our test object.
54 scoped_ptr<MockMediaStreamDispatcher> ms_dispatcher(
55 new MockMediaStreamDispatcher());
56 scoped_ptr<content::P2PSocketDispatcher> p2p_socket_dispatcher(
57 new content::P2PSocketDispatcher(NULL));
58 scoped_refptr<VideoCaptureImplManager> vc_manager(
59 new VideoCaptureImplManager());
60 MockMediaStreamDependencyFactory* dependency_factory =
61 new MockMediaStreamDependencyFactory();
62 scoped_refptr<MediaStreamImpl> ms_impl(new MediaStreamImpl(
63 ms_dispatcher.get(),
64 p2p_socket_dispatcher.get(),
65 vc_manager.get(),
66 dependency_factory));
67
68 // TODO(grunell): Add tests for WebKit::WebUserMediaClient and
69 // MediaStreamDispatcherEventHandler implementations.
70
71 WebKit::MockWebPeerConnectionHandlerClient client;
72 WebKit::WebPeerConnectionHandler* pc_handler1 =
73 ms_impl->CreatePeerConnectionHandler(&client);
74 EXPECT_EQ(1u, ms_impl->peer_connection_handlers_.size());
75 WebKit::WebPeerConnectionHandler* pc_handler2 =
76 ms_impl->CreatePeerConnectionHandler(&client);
77 EXPECT_EQ(2u, ms_impl->peer_connection_handlers_.size());
78
79 ms_impl->ClosePeerConnection(
80 reinterpret_cast<PeerConnectionHandler*>(pc_handler1));
tommi (sloooow) - chröme 2012/02/29 13:37:00 is reinterpret_cast right here? It will cast the
Henrik Grunell 2012/03/23 12:51:56 Interesting, don't know why I used reinterpret her
81 EXPECT_EQ(1u, ms_impl->peer_connection_handlers_.size());
82 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 explicit
83 ms_impl->ClosePeerConnection(
84 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.
85 EXPECT_TRUE(ms_impl->peer_connection_handlers_.empty());
86 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.
87 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698