| 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 1424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1435 EXPECT_EQ_WAIT(expected_state, observers[i]->state(), 1000); | 1435 EXPECT_EQ_WAIT(expected_state, observers[i]->state(), 1000); |
| 1436 if (success) { | 1436 if (success) { |
| 1437 EXPECT_TRUE(observers[i]->description() != NULL); | 1437 EXPECT_TRUE(observers[i]->description() != NULL); |
| 1438 } else { | 1438 } else { |
| 1439 EXPECT_TRUE(observers[i]->description() == NULL); | 1439 EXPECT_TRUE(observers[i]->description() == NULL); |
| 1440 } | 1440 } |
| 1441 } | 1441 } |
| 1442 } | 1442 } |
| 1443 | 1443 |
| 1444 void ConfigureAllocatorWithTurn() { | 1444 void ConfigureAllocatorWithTurn() { |
| 1445 cricket::RelayServerConfig relay_server(cricket::RELAY_TURN); | 1445 cricket::RelayServerConfig turn_server(cricket::RELAY_TURN); |
| 1446 cricket::RelayCredentials credentials(kTurnUsername, kTurnPassword); | 1446 cricket::RelayCredentials credentials(kTurnUsername, kTurnPassword); |
| 1447 relay_server.credentials = credentials; | 1447 turn_server.credentials = credentials; |
| 1448 relay_server.ports.push_back(cricket::ProtocolAddress( | 1448 turn_server.ports.push_back( |
| 1449 kTurnUdpIntAddr, cricket::PROTO_UDP, false)); | 1449 cricket::ProtocolAddress(kTurnUdpIntAddr, cricket::PROTO_UDP, false)); |
| 1450 allocator_->AddRelay(relay_server); | 1450 allocator_->AddTurnServer(turn_server); |
| 1451 allocator_->set_step_delay(cricket::kMinimumStepDelay); | 1451 allocator_->set_step_delay(cricket::kMinimumStepDelay); |
| 1452 allocator_->set_flags(cricket::PORTALLOCATOR_DISABLE_TCP); | 1452 allocator_->set_flags(cricket::PORTALLOCATOR_DISABLE_TCP); |
| 1453 } | 1453 } |
| 1454 | 1454 |
| 1455 cricket::FakeMediaEngine* media_engine_; | 1455 cricket::FakeMediaEngine* media_engine_; |
| 1456 cricket::FakeDataEngine* data_engine_; | 1456 cricket::FakeDataEngine* data_engine_; |
| 1457 rtc::scoped_ptr<cricket::ChannelManager> channel_manager_; | 1457 rtc::scoped_ptr<cricket::ChannelManager> channel_manager_; |
| 1458 cricket::FakeCall fake_call_; | 1458 cricket::FakeCall fake_call_; |
| 1459 rtc::scoped_ptr<webrtc::MediaControllerInterface> media_controller_; | 1459 rtc::scoped_ptr<webrtc::MediaControllerInterface> media_controller_; |
| 1460 rtc::scoped_ptr<cricket::TransportDescriptionFactory> tdesc_factory_; | 1460 rtc::scoped_ptr<cricket::TransportDescriptionFactory> tdesc_factory_; |
| (...skipping 2749 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4210 } | 4210 } |
| 4211 | 4211 |
| 4212 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test | 4212 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test |
| 4213 // currently fails because upon disconnection and reconnection OnIceComplete is | 4213 // currently fails because upon disconnection and reconnection OnIceComplete is |
| 4214 // called more than once without returning to IceGatheringGathering. | 4214 // called more than once without returning to IceGatheringGathering. |
| 4215 | 4215 |
| 4216 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, | 4216 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, |
| 4217 WebRtcSessionTest, | 4217 WebRtcSessionTest, |
| 4218 testing::Values(ALREADY_GENERATED, | 4218 testing::Values(ALREADY_GENERATED, |
| 4219 DTLS_IDENTITY_STORE)); | 4219 DTLS_IDENTITY_STORE)); |
| OLD | NEW |