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

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

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

Powered by Google App Engine
This is Rietveld 408576698