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

Side by Side 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, 8 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"
11 #include "content/renderer/media/peer_connection_handler.h"
11 #include "content/renderer/media/video_capture_impl_manager.h" 12 #include "content/renderer/media/video_capture_impl_manager.h"
12 #include "content/renderer/p2p/socket_dispatcher.h" 13 #include "content/renderer/p2p/socket_dispatcher.h"
13 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
14 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConne ctionHandler.h" 15 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConne ctionHandler.h"
15 16
16 // Disabled due to http://crbug.com/112408 . 17 // Disabled due to http://crbug.com/112408 .
17 TEST(MediaStreamImplTest, DISABLED_Basic) { 18 TEST(MediaStreamImplTest, DISABLED_Basic) {
18 MessageLoop loop; 19 MessageLoop loop;
19 20
20 // Create our test object. 21 // Create our test object.
(...skipping 10 matching lines...) Expand all
31 p2p_socket_dispatcher.get(), 32 p2p_socket_dispatcher.get(),
32 vc_manager.get(), 33 vc_manager.get(),
33 dependency_factory)); 34 dependency_factory));
34 35
35 // TODO(grunell): Add tests for WebKit::WebUserMediaClient and 36 // TODO(grunell): Add tests for WebKit::WebUserMediaClient and
36 // MediaStreamDispatcherEventHandler implementations. 37 // MediaStreamDispatcherEventHandler implementations.
37 38
38 WebKit::MockWebPeerConnectionHandlerClient client; 39 WebKit::MockWebPeerConnectionHandlerClient client;
39 WebKit::WebPeerConnectionHandler* pc_handler = 40 WebKit::WebPeerConnectionHandler* pc_handler =
40 ms_impl->CreatePeerConnectionHandler(&client); 41 ms_impl->CreatePeerConnectionHandler(&client);
41 EXPECT_TRUE(ms_impl->peer_connection_handler_); 42 EXPECT_EQ(1u, ms_impl->peer_connection_handlers_.size());
42 43
43 ms_impl->ClosePeerConnection(); 44 ms_impl->ClosePeerConnection(
44 EXPECT_FALSE(ms_impl->peer_connection_handler_); 45 reinterpret_cast<PeerConnectionHandlerBase*>(pc_handler));
46 EXPECT_TRUE(ms_impl->peer_connection_handlers_.empty());
45 delete pc_handler; 47 delete pc_handler;
48
49 // TODO(grunell): JSEP.
46 } 50 }
51
52 // Disabled due to http://crbug.com/112408 .
53 TEST(MediaStreamImplTest, DISABLED_MultiplePeerConnections) {
54 MessageLoop loop;
55
56 // Create our test object.
57 scoped_ptr<MockMediaStreamDispatcher> ms_dispatcher(
58 new MockMediaStreamDispatcher());
59 scoped_ptr<content::P2PSocketDispatcher> p2p_socket_dispatcher(
60 new content::P2PSocketDispatcher(NULL));
61 scoped_refptr<VideoCaptureImplManager> vc_manager(
62 new VideoCaptureImplManager());
63 MockMediaStreamDependencyFactory* dependency_factory =
64 new MockMediaStreamDependencyFactory();
65 scoped_refptr<MediaStreamImpl> ms_impl(new MediaStreamImpl(
66 ms_dispatcher.get(),
67 p2p_socket_dispatcher.get(),
68 vc_manager.get(),
69 dependency_factory));
70
71 // TODO(grunell): Add tests for WebKit::WebUserMediaClient and
72 // MediaStreamDispatcherEventHandler implementations.
73
74 // TODO(grunell): JSEP.
75
76 WebKit::MockWebPeerConnectionHandlerClient client;
77 WebKit::WebPeerConnectionHandler* pc_handler1 =
78 ms_impl->CreatePeerConnectionHandler(&client);
79 EXPECT_EQ(1u, ms_impl->peer_connection_handlers_.size());
80 WebKit::WebPeerConnectionHandler* pc_handler2 =
81 ms_impl->CreatePeerConnectionHandler(&client);
82 EXPECT_EQ(2u, ms_impl->peer_connection_handlers_.size());
83
84 ms_impl->ClosePeerConnection(
85 static_cast<PeerConnectionHandler*>(pc_handler1));
86 EXPECT_EQ(1u, ms_impl->peer_connection_handlers_.size());
87 delete pc_handler1;
88 ms_impl->ClosePeerConnection(
89 static_cast<PeerConnectionHandler*>(pc_handler2));
90 EXPECT_TRUE(ms_impl->peer_connection_handlers_.empty());
91 delete pc_handler2;
92 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698