| 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 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 channel1->SetConnectionCount(2); | 127 channel1->SetConnectionCount(2); |
| 128 channel2->SetConnectionCount(2); | 128 channel2->SetConnectionCount(2); |
| 129 channel1->SetReceiving(true); | 129 channel1->SetReceiving(true); |
| 130 channel2->SetReceiving(true); | 130 channel2->SetReceiving(true); |
| 131 channel1->SetWritable(true); | 131 channel1->SetWritable(true); |
| 132 channel2->SetWritable(true); | 132 channel2->SetWritable(true); |
| 133 channel1->SetConnectionCount(1); | 133 channel1->SetConnectionCount(1); |
| 134 channel2->SetConnectionCount(1); | 134 channel2->SetConnectionCount(1); |
| 135 } | 135 } |
| 136 | 136 |
| 137 cricket::IceConfig CreateIceConfig(int receiving_timeout_ms, | 137 cricket::IceConfig CreateIceConfig(int receiving_timeout, |
| 138 bool gather_continually) { | 138 bool gather_continually) { |
| 139 cricket::IceConfig config; | 139 cricket::IceConfig config; |
| 140 config.receiving_timeout_ms = receiving_timeout_ms; | 140 config.receiving_timeout = receiving_timeout; |
| 141 config.gather_continually = gather_continually; | 141 config.gather_continually = gather_continually; |
| 142 return config; | 142 return config; |
| 143 } | 143 } |
| 144 | 144 |
| 145 protected: | 145 protected: |
| 146 void OnConnectionState(IceConnectionState state) { | 146 void OnConnectionState(IceConnectionState state) { |
| 147 if (!signaling_thread_->IsCurrent()) { | 147 if (!signaling_thread_->IsCurrent()) { |
| 148 signaled_on_non_signaling_thread_ = true; | 148 signaled_on_non_signaling_thread_ = true; |
| 149 } | 149 } |
| 150 connection_state_ = state; | 150 connection_state_ = state; |
| (...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 677 // new --> gathering --> complete | 677 // new --> gathering --> complete |
| 678 EXPECT_EQ_WAIT(cricket::kIceGatheringComplete, gathering_state_, kTimeout); | 678 EXPECT_EQ_WAIT(cricket::kIceGatheringComplete, gathering_state_, kTimeout); |
| 679 EXPECT_EQ(2, gathering_state_signal_count_); | 679 EXPECT_EQ(2, gathering_state_signal_count_); |
| 680 | 680 |
| 681 EXPECT_EQ_WAIT(1U, candidates_["audio"].size(), kTimeout); | 681 EXPECT_EQ_WAIT(1U, candidates_["audio"].size(), kTimeout); |
| 682 EXPECT_EQ_WAIT(1U, candidates_["video"].size(), kTimeout); | 682 EXPECT_EQ_WAIT(1U, candidates_["video"].size(), kTimeout); |
| 683 EXPECT_EQ(2, candidates_signal_count_); | 683 EXPECT_EQ(2, candidates_signal_count_); |
| 684 | 684 |
| 685 EXPECT_TRUE(!signaled_on_non_signaling_thread_); | 685 EXPECT_TRUE(!signaled_on_non_signaling_thread_); |
| 686 } | 686 } |
| OLD | NEW |