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

Side by Side Diff: webrtc/api/webrtcsession_unittest.cc

Issue 2614263002: Remove BaseChannel's dependency on TransportController. (Closed)
Patch Set: cr comments Created 3 years, 11 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
OLDNEW
1 /* 1 /*
2 * Copyright 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2012 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 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 rtc::PacketTransportInterface* video_rtcp_transport_channel() { 299 rtc::PacketTransportInterface* video_rtcp_transport_channel() {
300 return rtcp_transport_channel(video_channel()); 300 return rtcp_transport_channel(video_channel());
301 } 301 }
302 302
303 private: 303 private:
304 rtc::PacketTransportInterface* rtp_transport_channel( 304 rtc::PacketTransportInterface* rtp_transport_channel(
305 cricket::BaseChannel* ch) { 305 cricket::BaseChannel* ch) {
306 if (!ch) { 306 if (!ch) {
307 return nullptr; 307 return nullptr;
308 } 308 }
309 return ch->transport_channel(); 309 return ch->rtp_transport();
310 } 310 }
311 311
312 rtc::PacketTransportInterface* rtcp_transport_channel( 312 rtc::PacketTransportInterface* rtcp_transport_channel(
313 cricket::BaseChannel* ch) { 313 cricket::BaseChannel* ch) {
314 if (!ch) { 314 if (!ch) {
315 return nullptr; 315 return nullptr;
316 } 316 }
317 return ch->rtcp_transport_channel(); 317 return ch->rtcp_transport();
318 } 318 }
319 }; 319 };
320 320
321 class WebRtcSessionCreateSDPObserverForTest 321 class WebRtcSessionCreateSDPObserverForTest
322 : public rtc::RefCountedObject<CreateSessionDescriptionObserver> { 322 : public rtc::RefCountedObject<CreateSessionDescriptionObserver> {
323 public: 323 public:
324 enum State { 324 enum State {
325 kInit, 325 kInit,
326 kFailed, 326 kFailed,
327 kSucceeded, 327 kSucceeded,
(...skipping 4115 matching lines...) Expand 10 before | Expand all | Expand 10 after
4443 } 4443 }
4444 4444
4445 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test 4445 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test
4446 // currently fails because upon disconnection and reconnection OnIceComplete is 4446 // currently fails because upon disconnection and reconnection OnIceComplete is
4447 // called more than once without returning to IceGatheringGathering. 4447 // called more than once without returning to IceGatheringGathering.
4448 4448
4449 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, 4449 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests,
4450 WebRtcSessionTest, 4450 WebRtcSessionTest,
4451 testing::Values(ALREADY_GENERATED, 4451 testing::Values(ALREADY_GENERATED,
4452 DTLS_IDENTITY_STORE)); 4452 DTLS_IDENTITY_STORE));
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698