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 /* |
11 #include <memory> | 11 #include <memory> |
12 #include <utility> | 12 #include <utility> |
13 #include <vector> | 13 #include <vector> |
14 | 14 |
15 #include "webrtc/api/audiotrack.h" | 15 #include "webrtc/api/audiotrack.h" |
16 #include "webrtc/api/fakemediacontroller.h" | 16 #include "webrtc/api/fakemediacontroller.h" |
17 #include "webrtc/api/fakemetricsobserver.h" | 17 #include "webrtc/api/fakemetricsobserver.h" |
18 #include "webrtc/api/jsepicecandidate.h" | 18 #include "webrtc/api/jsepicecandidate.h" |
19 #include "webrtc/api/jsepsessiondescription.h" | 19 #include "webrtc/api/jsepsessiondescription.h" |
20 #include "webrtc/api/peerconnection.h" | 20 #include "webrtc/api/peerconnection.h" |
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
360 metrics_observer_(new rtc::RefCountedObject<FakeMetricsObserver>()) { | 360 metrics_observer_(new rtc::RefCountedObject<FakeMetricsObserver>()) { |
361 cricket::ServerAddresses stun_servers; | 361 cricket::ServerAddresses stun_servers; |
362 stun_servers.insert(stun_socket_addr_); | 362 stun_servers.insert(stun_socket_addr_); |
363 allocator_.reset(new cricket::BasicPortAllocator( | 363 allocator_.reset(new cricket::BasicPortAllocator( |
364 &network_manager_, | 364 &network_manager_, |
365 stun_servers, | 365 stun_servers, |
366 SocketAddress(), SocketAddress(), SocketAddress())); | 366 SocketAddress(), SocketAddress(), SocketAddress())); |
367 allocator_->set_flags(cricket::PORTALLOCATOR_DISABLE_TCP | | 367 allocator_->set_flags(cricket::PORTALLOCATOR_DISABLE_TCP | |
368 cricket::PORTALLOCATOR_DISABLE_RELAY); | 368 cricket::PORTALLOCATOR_DISABLE_RELAY); |
369 EXPECT_TRUE(channel_manager_->Init()); | 369 EXPECT_TRUE(channel_manager_->Init()); |
370 desc_factory_->set_add_legacy_streams(false); | |
371 allocator_->set_step_delay(cricket::kMinimumStepDelay); | 370 allocator_->set_step_delay(cricket::kMinimumStepDelay); |
372 } | 371 } |
373 | 372 |
374 void AddInterface(const SocketAddress& addr) { | 373 void AddInterface(const SocketAddress& addr) { |
375 network_manager_.AddInterface(addr); | 374 network_manager_.AddInterface(addr); |
376 } | 375 } |
377 void RemoveInterface(const SocketAddress& addr) { | 376 void RemoveInterface(const SocketAddress& addr) { |
378 network_manager_.RemoveInterface(addr); | 377 network_manager_.RemoveInterface(addr); |
379 } | 378 } |
380 | 379 |
(...skipping 3980 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4361 } | 4360 } |
4362 | 4361 |
4363 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test | 4362 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test |
4364 // currently fails because upon disconnection and reconnection OnIceComplete is | 4363 // currently fails because upon disconnection and reconnection OnIceComplete is |
4365 // called more than once without returning to IceGatheringGathering. | 4364 // called more than once without returning to IceGatheringGathering. |
4366 | 4365 |
4367 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, | 4366 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, |
4368 WebRtcSessionTest, | 4367 WebRtcSessionTest, |
4369 testing::Values(ALREADY_GENERATED, | 4368 testing::Values(ALREADY_GENERATED, |
4370 DTLS_IDENTITY_STORE)); | 4369 DTLS_IDENTITY_STORE)); |
| 4370 */ |
OLD | NEW |