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

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

Issue 2614263002: Remove BaseChannel's dependency on TransportController. (Closed)
Patch Set: Fix the channel_unittests 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 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 rtc::PacketTransportInterface* data_rtcp_transport_channel() { 256 rtc::PacketTransportInterface* data_rtcp_transport_channel() {
257 return rtcp_transport_channel(data_channel()); 257 return rtcp_transport_channel(data_channel());
258 } 258 }
259 259
260 private: 260 private:
261 rtc::PacketTransportInterface* rtp_transport_channel( 261 rtc::PacketTransportInterface* rtp_transport_channel(
262 cricket::BaseChannel* ch) { 262 cricket::BaseChannel* ch) {
263 if (!ch) { 263 if (!ch) {
264 return nullptr; 264 return nullptr;
265 } 265 }
266 return ch->transport_channel(); 266 return ch->rtp_transport();
267 } 267 }
268 268
269 rtc::PacketTransportInterface* rtcp_transport_channel( 269 rtc::PacketTransportInterface* rtcp_transport_channel(
270 cricket::BaseChannel* ch) { 270 cricket::BaseChannel* ch) {
271 if (!ch) { 271 if (!ch) {
272 return nullptr; 272 return nullptr;
273 } 273 }
274 return ch->rtcp_transport_channel(); 274 return ch->rtcp_transport();
275 } 275 }
276 }; 276 };
277 277
278 class WebRtcSessionCreateSDPObserverForTest 278 class WebRtcSessionCreateSDPObserverForTest
279 : public rtc::RefCountedObject<CreateSessionDescriptionObserver> { 279 : public rtc::RefCountedObject<CreateSessionDescriptionObserver> {
280 public: 280 public:
281 enum State { 281 enum State {
282 kInit, 282 kInit,
283 kFailed, 283 kFailed,
284 kSucceeded, 284 kSucceeded,
(...skipping 4076 matching lines...) Expand 10 before | Expand all | Expand 10 after
4361 } 4361 }
4362 4362
4363 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test 4363 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test
4364 // currently fails because upon disconnection and reconnection OnIceComplete is 4364 // currently fails because upon disconnection and reconnection OnIceComplete is
4365 // called more than once without returning to IceGatheringGathering. 4365 // called more than once without returning to IceGatheringGathering.
4366 4366
4367 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, 4367 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests,
4368 WebRtcSessionTest, 4368 WebRtcSessionTest,
4369 testing::Values(ALREADY_GENERATED, 4369 testing::Values(ALREADY_GENERATED,
4370 DTLS_IDENTITY_STORE)); 4370 DTLS_IDENTITY_STORE));
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698