| OLD | NEW |
| 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 1469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1480 EXPECT_TRUE(observers[i]->description() == NULL); | 1480 EXPECT_TRUE(observers[i]->description() == NULL); |
| 1481 } | 1481 } |
| 1482 } | 1482 } |
| 1483 } | 1483 } |
| 1484 | 1484 |
| 1485 void ConfigureAllocatorWithTurn() { | 1485 void ConfigureAllocatorWithTurn() { |
| 1486 cricket::RelayServerConfig turn_server(cricket::RELAY_TURN); | 1486 cricket::RelayServerConfig turn_server(cricket::RELAY_TURN); |
| 1487 cricket::RelayCredentials credentials(kTurnUsername, kTurnPassword); | 1487 cricket::RelayCredentials credentials(kTurnUsername, kTurnPassword); |
| 1488 turn_server.credentials = credentials; | 1488 turn_server.credentials = credentials; |
| 1489 turn_server.ports.push_back( | 1489 turn_server.ports.push_back( |
| 1490 cricket::ProtocolAddress(kTurnUdpIntAddr, cricket::PROTO_UDP, false)); | 1490 cricket::ProtocolAddress(kTurnUdpIntAddr, cricket::PROTO_UDP)); |
| 1491 allocator_->AddTurnServer(turn_server); | 1491 allocator_->AddTurnServer(turn_server); |
| 1492 allocator_->set_step_delay(cricket::kMinimumStepDelay); | 1492 allocator_->set_step_delay(cricket::kMinimumStepDelay); |
| 1493 allocator_->set_flags(cricket::PORTALLOCATOR_DISABLE_TCP); | 1493 allocator_->set_flags(cricket::PORTALLOCATOR_DISABLE_TCP); |
| 1494 } | 1494 } |
| 1495 | 1495 |
| 1496 webrtc::RtcEventLogNullImpl event_log_; | 1496 webrtc::RtcEventLogNullImpl event_log_; |
| 1497 cricket::FakeMediaEngine* media_engine_; | 1497 cricket::FakeMediaEngine* media_engine_; |
| 1498 cricket::FakeDataEngine* data_engine_; | 1498 cricket::FakeDataEngine* data_engine_; |
| 1499 std::unique_ptr<cricket::ChannelManager> channel_manager_; | 1499 std::unique_ptr<cricket::ChannelManager> channel_manager_; |
| 1500 cricket::FakeCall fake_call_; | 1500 cricket::FakeCall fake_call_; |
| (...skipping 2861 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4362 } | 4362 } |
| 4363 | 4363 |
| 4364 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test | 4364 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test |
| 4365 // currently fails because upon disconnection and reconnection OnIceComplete is | 4365 // currently fails because upon disconnection and reconnection OnIceComplete is |
| 4366 // called more than once without returning to IceGatheringGathering. | 4366 // called more than once without returning to IceGatheringGathering. |
| 4367 | 4367 |
| 4368 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, | 4368 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, |
| 4369 WebRtcSessionTest, | 4369 WebRtcSessionTest, |
| 4370 testing::Values(ALREADY_GENERATED, | 4370 testing::Values(ALREADY_GENERATED, |
| 4371 DTLS_IDENTITY_STORE)); | 4371 DTLS_IDENTITY_STORE)); |
| OLD | NEW |