| OLD | NEW |
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2012 Google Inc. | 3 * Copyright 2012 Google Inc. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
| 9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
| (...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 390 rtc::Thread::Current(), allocator_.get(), | 390 rtc::Thread::Current(), allocator_.get(), |
| 391 &observer_, | 391 &observer_, |
| 392 &mediastream_signaling_)); | 392 &mediastream_signaling_)); |
| 393 | 393 |
| 394 EXPECT_EQ(PeerConnectionInterface::kIceConnectionNew, | 394 EXPECT_EQ(PeerConnectionInterface::kIceConnectionNew, |
| 395 observer_.ice_connection_state_); | 395 observer_.ice_connection_state_); |
| 396 EXPECT_EQ(PeerConnectionInterface::kIceGatheringNew, | 396 EXPECT_EQ(PeerConnectionInterface::kIceGatheringNew, |
| 397 observer_.ice_gathering_state_); | 397 observer_.ice_gathering_state_); |
| 398 | 398 |
| 399 EXPECT_TRUE(session_->Initialize(options_, constraints_.get(), | 399 EXPECT_TRUE(session_->Initialize(options_, constraints_.get(), |
| 400 identity_service, rtc_configuration)); | 400 identity_service, rtc::KT_DEFAULT, |
| 401 rtc_configuration)); |
| 401 session_->set_metrics_observer(&metrics_observer_); | 402 session_->set_metrics_observer(&metrics_observer_); |
| 402 } | 403 } |
| 403 | 404 |
| 404 void Init() { | 405 void Init() { |
| 405 PeerConnectionInterface::RTCConfiguration configuration; | 406 PeerConnectionInterface::RTCConfiguration configuration; |
| 406 Init(NULL, configuration); | 407 Init(NULL, configuration); |
| 407 } | 408 } |
| 408 | 409 |
| 409 void InitWithIceTransport( | 410 void InitWithIceTransport( |
| 410 PeerConnectionInterface::IceTransportsType ice_transport_type) { | 411 PeerConnectionInterface::IceTransportsType ice_transport_type) { |
| (...skipping 3463 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3874 EXPECT_EQ(4000, option_val); | 3875 EXPECT_EQ(4000, option_val); |
| 3875 | 3876 |
| 3876 EXPECT_TRUE(session_->voice_channel()->transport_channel()->GetOption( | 3877 EXPECT_TRUE(session_->voice_channel()->transport_channel()->GetOption( |
| 3877 rtc::Socket::Option::OPT_RCVBUF, &option_val)); | 3878 rtc::Socket::Option::OPT_RCVBUF, &option_val)); |
| 3878 EXPECT_EQ(8000, option_val); | 3879 EXPECT_EQ(8000, option_val); |
| 3879 } | 3880 } |
| 3880 | 3881 |
| 3881 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test | 3882 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test |
| 3882 // currently fails because upon disconnection and reconnection OnIceComplete is | 3883 // currently fails because upon disconnection and reconnection OnIceComplete is |
| 3883 // called more than once without returning to IceGatheringGathering. | 3884 // called more than once without returning to IceGatheringGathering. |
| OLD | NEW |