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

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

Issue 10181001: Fix memory leak in MediaStreamImplTest. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_00_handler_client.h" 10 #include "content/renderer/media/mock_web_peer_connection_00_handler_client.h"
(...skipping 16 matching lines...) Expand all
27 new VideoCaptureImplManager()); 27 new VideoCaptureImplManager());
28 MockMediaStreamDependencyFactory* dependency_factory = 28 MockMediaStreamDependencyFactory* dependency_factory =
29 new MockMediaStreamDependencyFactory(); 29 new MockMediaStreamDependencyFactory();
30 ms_impl_.reset(new MediaStreamImpl(NULL, 30 ms_impl_.reset(new MediaStreamImpl(NULL,
31 ms_dispatcher_.get(), 31 ms_dispatcher_.get(),
32 p2p_socket_dispatcher_.get(), 32 p2p_socket_dispatcher_.get(),
33 vc_manager.get(), 33 vc_manager.get(),
34 dependency_factory)); 34 dependency_factory));
35 } 35 }
36 36
37 void TearDown() {
38 loop_.RunAllPending();
tommi (sloooow) - chröme 2012/04/23 12:17:52 Add a comment for why this is needed (maybe even m
39 }
40
37 protected: 41 protected:
38 MessageLoop loop_; 42 MessageLoop loop_;
39 scoped_ptr<MockMediaStreamDispatcher> ms_dispatcher_; 43 scoped_ptr<MockMediaStreamDispatcher> ms_dispatcher_;
40 scoped_ptr<content::P2PSocketDispatcher> p2p_socket_dispatcher_; 44 scoped_ptr<content::P2PSocketDispatcher> p2p_socket_dispatcher_;
41 scoped_ptr<MediaStreamImpl> ms_impl_; 45 scoped_ptr<MediaStreamImpl> ms_impl_;
42 }; 46 };
43 47
44 TEST_F(MediaStreamImplTest, Basic) { 48 TEST_F(MediaStreamImplTest, Basic) {
45 // TODO(grunell): Add tests for WebKit::WebUserMediaClient and 49 // TODO(grunell): Add tests for WebKit::WebUserMediaClient and
46 // MediaStreamDispatcherEventHandler implementations. 50 // MediaStreamDispatcherEventHandler implementations.
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 static_cast<PeerConnectionHandler*>(pc_handler)); 91 static_cast<PeerConnectionHandler*>(pc_handler));
88 EXPECT_EQ(1u, ms_impl_->peer_connection_handlers_.size()); 92 EXPECT_EQ(1u, ms_impl_->peer_connection_handlers_.size());
89 delete pc_handler; 93 delete pc_handler;
90 94
91 // Delete PC handler explicitly after closing to mimic WebKit behavior. 95 // Delete PC handler explicitly after closing to mimic WebKit behavior.
92 ms_impl_->ClosePeerConnection( 96 ms_impl_->ClosePeerConnection(
93 static_cast<PeerConnectionHandlerJsep*>(pc_handler_jsep)); 97 static_cast<PeerConnectionHandlerJsep*>(pc_handler_jsep));
94 EXPECT_TRUE(ms_impl_->peer_connection_handlers_.empty()); 98 EXPECT_TRUE(ms_impl_->peer_connection_handlers_.empty());
95 delete pc_handler_jsep; 99 delete pc_handler_jsep;
96 } 100 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698