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

Side by Side Diff: webrtc/p2p/client/basicportallocator_unittest.cc

Issue 2237853002: Remove obosolete SessionId setter/getter from PortAllocator. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Remove deprecation include again. Created 4 years, 4 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
« no previous file with comments | « webrtc/p2p/base/transportchannel.h ('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 /* 1 /*
2 * Copyright 2009 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2009 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 int component) { 228 int component) {
229 return CreateSession(sid, content_name, component, kIceUfrag0, kIcePwd0); 229 return CreateSession(sid, content_name, component, kIceUfrag0, kIcePwd0);
230 } 230 }
231 231
232 std::unique_ptr<PortAllocatorSession> CreateSession( 232 std::unique_ptr<PortAllocatorSession> CreateSession(
233 const std::string& sid, 233 const std::string& sid,
234 const std::string& content_name, 234 const std::string& content_name,
235 int component, 235 int component,
236 const std::string& ice_ufrag, 236 const std::string& ice_ufrag,
237 const std::string& ice_pwd) { 237 const std::string& ice_pwd) {
238 std::unique_ptr<PortAllocatorSession> session = allocator_->CreateSession( 238 std::unique_ptr<PortAllocatorSession> session =
239 sid, content_name, component, ice_ufrag, ice_pwd); 239 allocator_->CreateSession(content_name, component, ice_ufrag, ice_pwd);
240 session->SignalPortReady.connect(this, 240 session->SignalPortReady.connect(this,
241 &BasicPortAllocatorTest::OnPortReady); 241 &BasicPortAllocatorTest::OnPortReady);
242 session->SignalPortsPruned.connect(this, 242 session->SignalPortsPruned.connect(this,
243 &BasicPortAllocatorTest::OnPortsPruned); 243 &BasicPortAllocatorTest::OnPortsPruned);
244 session->SignalCandidatesReady.connect( 244 session->SignalCandidatesReady.connect(
245 this, &BasicPortAllocatorTest::OnCandidatesReady); 245 this, &BasicPortAllocatorTest::OnCandidatesReady);
246 session->SignalCandidatesAllocationDone.connect( 246 session->SignalCandidatesAllocationDone.connect(
247 this, &BasicPortAllocatorTest::OnCandidatesAllocationDone); 247 this, &BasicPortAllocatorTest::OnCandidatesAllocationDone);
248 return session; 248 return session;
249 } 249 }
(...skipping 1455 matching lines...) Expand 10 before | Expand all | Expand 10 after
1705 for (const Candidate& candidate : candidates) { 1705 for (const Candidate& candidate : candidates) {
1706 // Expect only relay candidates now that the filter is applied. 1706 // Expect only relay candidates now that the filter is applied.
1707 EXPECT_EQ(std::string(RELAY_PORT_TYPE), candidate.type()); 1707 EXPECT_EQ(std::string(RELAY_PORT_TYPE), candidate.type());
1708 // Expect that the raddr is emptied due to the CF_RELAY filter. 1708 // Expect that the raddr is emptied due to the CF_RELAY filter.
1709 EXPECT_EQ(candidate.related_address(), 1709 EXPECT_EQ(candidate.related_address(),
1710 rtc::EmptySocketAddressWithFamily(candidate.address().family())); 1710 rtc::EmptySocketAddressWithFamily(candidate.address().family()));
1711 } 1711 }
1712 } 1712 }
1713 1713
1714 } // namespace cricket 1714 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/p2p/base/transportchannel.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698