| 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 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 561 create_media_controller_called_ = true; | 561 create_media_controller_called_ = true; |
| 562 create_media_controller_config_ = config; | 562 create_media_controller_config_ = config; |
| 563 | 563 |
| 564 webrtc::MediaControllerInterface* mc = | 564 webrtc::MediaControllerInterface* mc = |
| 565 PeerConnectionFactory::CreateMediaController(config); | 565 PeerConnectionFactory::CreateMediaController(config); |
| 566 EXPECT_TRUE(mc != nullptr); | 566 EXPECT_TRUE(mc != nullptr); |
| 567 return mc; | 567 return mc; |
| 568 } | 568 } |
| 569 | 569 |
| 570 cricket::TransportController* CreateTransportController( | 570 cricket::TransportController* CreateTransportController( |
| 571 cricket::PortAllocator* port_allocator) override { | 571 cricket::PortAllocator* port_allocator, |
| 572 bool redetermine_role_on_ice_restart) override { |
| 572 transport_controller = new cricket::TransportController( | 573 transport_controller = new cricket::TransportController( |
| 573 rtc::Thread::Current(), rtc::Thread::Current(), port_allocator); | 574 rtc::Thread::Current(), rtc::Thread::Current(), port_allocator, |
| 575 redetermine_role_on_ice_restart); |
| 574 return transport_controller; | 576 return transport_controller; |
| 575 } | 577 } |
| 576 | 578 |
| 577 cricket::TransportController* transport_controller; | 579 cricket::TransportController* transport_controller; |
| 578 // Mutable, so they can be modified in the above const-declared method. | 580 // Mutable, so they can be modified in the above const-declared method. |
| 579 mutable bool create_media_controller_called_ = false; | 581 mutable bool create_media_controller_called_ = false; |
| 580 mutable cricket::MediaConfig create_media_controller_config_; | 582 mutable cricket::MediaConfig create_media_controller_config_; |
| 581 }; | 583 }; |
| 582 | 584 |
| 583 class PeerConnectionInterfaceTest : public testing::Test { | 585 class PeerConnectionInterfaceTest : public testing::Test { |
| (...skipping 2304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2888 FakeConstraints updated_answer_c; | 2890 FakeConstraints updated_answer_c; |
| 2889 answer_c.SetMandatoryReceiveAudio(false); | 2891 answer_c.SetMandatoryReceiveAudio(false); |
| 2890 answer_c.SetMandatoryReceiveVideo(false); | 2892 answer_c.SetMandatoryReceiveVideo(false); |
| 2891 | 2893 |
| 2892 cricket::MediaSessionOptions updated_answer_options; | 2894 cricket::MediaSessionOptions updated_answer_options; |
| 2893 EXPECT_TRUE( | 2895 EXPECT_TRUE( |
| 2894 ParseConstraintsForAnswer(&updated_answer_c, &updated_answer_options)); | 2896 ParseConstraintsForAnswer(&updated_answer_c, &updated_answer_options)); |
| 2895 EXPECT_TRUE(updated_answer_options.has_audio()); | 2897 EXPECT_TRUE(updated_answer_options.has_audio()); |
| 2896 EXPECT_TRUE(updated_answer_options.has_video()); | 2898 EXPECT_TRUE(updated_answer_options.has_video()); |
| 2897 } | 2899 } |
| OLD | NEW |