OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2015 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2015 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 Candidate c; | 93 Candidate c; |
94 c.set_address(rtc::SocketAddress("192.168.1.1", 8000)); | 94 c.set_address(rtc::SocketAddress("192.168.1.1", 8000)); |
95 c.set_component(1); | 95 c.set_component(1); |
96 c.set_protocol(cricket::UDP_PROTOCOL_NAME); | 96 c.set_protocol(cricket::UDP_PROTOCOL_NAME); |
97 c.set_priority(1); | 97 c.set_priority(1); |
98 return c; | 98 return c; |
99 } | 99 } |
100 | 100 |
101 // Used for thread hopping test. | 101 // Used for thread hopping test. |
102 void CreateChannelsAndCompleteConnectionOnWorkerThread() { | 102 void CreateChannelsAndCompleteConnectionOnWorkerThread() { |
103 worker_thread_->Invoke<void>(rtc::Bind( | 103 worker_thread_->Invoke<void>( |
104 &TransportControllerTest::CreateChannelsAndCompleteConnection_w, this)); | 104 RTC_FROM_HERE, |
| 105 rtc::Bind( |
| 106 &TransportControllerTest::CreateChannelsAndCompleteConnection_w, |
| 107 this)); |
105 } | 108 } |
106 | 109 |
107 void CreateChannelsAndCompleteConnection_w() { | 110 void CreateChannelsAndCompleteConnection_w() { |
108 transport_controller_->SetIceRole(cricket::ICEROLE_CONTROLLING); | 111 transport_controller_->SetIceRole(cricket::ICEROLE_CONTROLLING); |
109 FakeTransportChannel* channel1 = CreateChannel("audio", 1); | 112 FakeTransportChannel* channel1 = CreateChannel("audio", 1); |
110 ASSERT_NE(nullptr, channel1); | 113 ASSERT_NE(nullptr, channel1); |
111 FakeTransportChannel* channel2 = CreateChannel("video", 1); | 114 FakeTransportChannel* channel2 = CreateChannel("video", 1); |
112 ASSERT_NE(nullptr, channel2); | 115 ASSERT_NE(nullptr, channel2); |
113 | 116 |
114 TransportDescription local_desc(std::vector<std::string>(), kIceUfrag1, | 117 TransportDescription local_desc(std::vector<std::string>(), kIceUfrag1, |
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
682 // new --> gathering --> complete | 685 // new --> gathering --> complete |
683 EXPECT_EQ_WAIT(cricket::kIceGatheringComplete, gathering_state_, kTimeout); | 686 EXPECT_EQ_WAIT(cricket::kIceGatheringComplete, gathering_state_, kTimeout); |
684 EXPECT_EQ(2, gathering_state_signal_count_); | 687 EXPECT_EQ(2, gathering_state_signal_count_); |
685 | 688 |
686 EXPECT_EQ_WAIT(1U, candidates_["audio"].size(), kTimeout); | 689 EXPECT_EQ_WAIT(1U, candidates_["audio"].size(), kTimeout); |
687 EXPECT_EQ_WAIT(1U, candidates_["video"].size(), kTimeout); | 690 EXPECT_EQ_WAIT(1U, candidates_["video"].size(), kTimeout); |
688 EXPECT_EQ(2, candidates_signal_count_); | 691 EXPECT_EQ(2, candidates_signal_count_); |
689 | 692 |
690 EXPECT_TRUE(!signaled_on_non_signaling_thread_); | 693 EXPECT_TRUE(!signaled_on_non_signaling_thread_); |
691 } | 694 } |
OLD | NEW |