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

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

Issue 698803002: Use WeakPtr for RTCPeerConnectionHandler and RTCPeerConnectionTracker. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « content/renderer/media/rtc_peer_connection_handler.cc ('k') | 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 <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 void SetUp() override { 214 void SetUp() override {
215 mock_client_.reset(new NiceMock<MockWebRTCPeerConnectionHandlerClient>()); 215 mock_client_.reset(new NiceMock<MockWebRTCPeerConnectionHandlerClient>());
216 mock_dependency_factory_.reset(new MockPeerConnectionDependencyFactory()); 216 mock_dependency_factory_.reset(new MockPeerConnectionDependencyFactory());
217 pc_handler_.reset( 217 pc_handler_.reset(
218 new RTCPeerConnectionHandlerUnderTest( 218 new RTCPeerConnectionHandlerUnderTest(
219 mock_client_.get(), mock_dependency_factory_.get(), 219 mock_client_.get(), mock_dependency_factory_.get(),
220 message_loop_.message_loop_proxy())); 220 message_loop_.message_loop_proxy()));
221 mock_tracker_.reset(new NiceMock<MockPeerConnectionTracker>()); 221 mock_tracker_.reset(new NiceMock<MockPeerConnectionTracker>());
222 blink::WebRTCConfiguration config; 222 blink::WebRTCConfiguration config;
223 blink::WebMediaConstraints constraints; 223 blink::WebMediaConstraints constraints;
224 EXPECT_TRUE(pc_handler_->InitializeForTest(config, constraints, 224 EXPECT_TRUE(pc_handler_->InitializeForTest(
225 mock_tracker_.get())); 225 config, constraints, mock_tracker_.get()->AsWeakPtr()));
226 226
227 mock_peer_connection_ = pc_handler_->native_peer_connection(); 227 mock_peer_connection_ = pc_handler_->native_peer_connection();
228 ASSERT_TRUE(mock_peer_connection_); 228 ASSERT_TRUE(mock_peer_connection_);
229 } 229 }
230 230
231 void TearDown() override { 231 void TearDown() override {
232 pc_handler_.reset(); 232 pc_handler_.reset();
233 mock_tracker_.reset(); 233 mock_tracker_.reset();
234 mock_dependency_factory_.reset(); 234 mock_dependency_factory_.reset();
235 mock_client_.reset(); 235 mock_client_.reset();
(...skipping 743 matching lines...) Expand 10 before | Expand all | Expand 10 after
979 EXPECT_CALL(*mock_tracker_.get(), 979 EXPECT_CALL(*mock_tracker_.get(),
980 TrackCreateDTMFSender(pc_handler_.get(), 980 TrackCreateDTMFSender(pc_handler_.get(),
981 testing::Ref(tracks[0]))); 981 testing::Ref(tracks[0])));
982 982
983 scoped_ptr<blink::WebRTCDTMFSenderHandler> sender( 983 scoped_ptr<blink::WebRTCDTMFSenderHandler> sender(
984 pc_handler_->createDTMFSender(tracks[0])); 984 pc_handler_->createDTMFSender(tracks[0]));
985 EXPECT_TRUE(sender.get()); 985 EXPECT_TRUE(sender.get());
986 } 986 }
987 987
988 } // namespace content 988 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/rtc_peer_connection_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698