| 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 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 ASSERT(false); | 184 ASSERT(false); |
| 185 } | 185 } |
| 186 | 186 |
| 187 // The ICE gathering state should always be Gathering when a candidate is | 187 // The ICE gathering state should always be Gathering when a candidate is |
| 188 // received (or possibly Completed in the case of the final candidate). | 188 // received (or possibly Completed in the case of the final candidate). |
| 189 EXPECT_NE(PeerConnectionInterface::kIceGatheringNew, ice_gathering_state_); | 189 EXPECT_NE(PeerConnectionInterface::kIceGatheringNew, ice_gathering_state_); |
| 190 } | 190 } |
| 191 | 191 |
| 192 // Some local candidates are removed. | 192 // Some local candidates are removed. |
| 193 void OnIceCandidatesRemoved( | 193 void OnIceCandidatesRemoved( |
| 194 const std::vector<cricket::Candidate>& candidates) override { | 194 const std::vector<cricket::Candidate>& candidates) { |
| 195 num_candidates_removed_ += candidates.size(); | 195 num_candidates_removed_ += candidates.size(); |
| 196 } | 196 } |
| 197 | 197 |
| 198 bool oncandidatesready_; | 198 bool oncandidatesready_; |
| 199 std::vector<cricket::Candidate> mline_0_candidates_; | 199 std::vector<cricket::Candidate> mline_0_candidates_; |
| 200 std::vector<cricket::Candidate> mline_1_candidates_; | 200 std::vector<cricket::Candidate> mline_1_candidates_; |
| 201 PeerConnectionInterface::IceConnectionState ice_connection_state_; | 201 PeerConnectionInterface::IceConnectionState ice_connection_state_; |
| 202 PeerConnectionInterface::IceGatheringState ice_gathering_state_; | 202 PeerConnectionInterface::IceGatheringState ice_gathering_state_; |
| 203 size_t num_candidates_removed_ = 0; | 203 size_t num_candidates_removed_ = 0; |
| 204 }; | 204 }; |
| (...skipping 4191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4396 } | 4396 } |
| 4397 | 4397 |
| 4398 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test | 4398 // TODO(bemasc): Add a TestIceStatesBundle with BUNDLE enabled. That test |
| 4399 // currently fails because upon disconnection and reconnection OnIceComplete is | 4399 // currently fails because upon disconnection and reconnection OnIceComplete is |
| 4400 // called more than once without returning to IceGatheringGathering. | 4400 // called more than once without returning to IceGatheringGathering. |
| 4401 | 4401 |
| 4402 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, | 4402 INSTANTIATE_TEST_CASE_P(WebRtcSessionTests, |
| 4403 WebRtcSessionTest, | 4403 WebRtcSessionTest, |
| 4404 testing::Values(ALREADY_GENERATED, | 4404 testing::Values(ALREADY_GENERATED, |
| 4405 DTLS_IDENTITY_STORE)); | 4405 DTLS_IDENTITY_STORE)); |
| OLD | NEW |