OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2004 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2004 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 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
255 c1[i].session_params != c2[i].session_params) | 255 c1[i].session_params != c2[i].session_params) |
256 return false; | 256 return false; |
257 return true; | 257 return true; |
258 } | 258 } |
259 | 259 |
260 // Returns true if the transport info contains "renomination" as an | 260 // Returns true if the transport info contains "renomination" as an |
261 // ICE option. | 261 // ICE option. |
262 bool GetIceRenomination(const TransportInfo* transport_info) { | 262 bool GetIceRenomination(const TransportInfo* transport_info) { |
263 const std::vector<std::string>& ice_options = | 263 const std::vector<std::string>& ice_options = |
264 transport_info->description.transport_options; | 264 transport_info->description.transport_options; |
265 auto iter = std::find(ice_options.begin(), ice_options.end(), | 265 auto iter = |
266 cricket::ICE_RENOMINATION_STR); | 266 std::find(ice_options.begin(), ice_options.end(), "renomination"); |
267 return iter != ice_options.end(); | 267 return iter != ice_options.end(); |
268 } | 268 } |
269 | 269 |
270 void TestTransportInfo(bool offer, const MediaSessionOptions& options, | 270 void TestTransportInfo(bool offer, const MediaSessionOptions& options, |
271 bool has_current_desc) { | 271 bool has_current_desc) { |
272 const std::string current_audio_ufrag = "current_audio_ufrag"; | 272 const std::string current_audio_ufrag = "current_audio_ufrag"; |
273 const std::string current_audio_pwd = "current_audio_pwd"; | 273 const std::string current_audio_pwd = "current_audio_pwd"; |
274 const std::string current_video_ufrag = "current_video_ufrag"; | 274 const std::string current_video_ufrag = "current_video_ufrag"; |
275 const std::string current_video_pwd = "current_video_pwd"; | 275 const std::string current_video_pwd = "current_video_pwd"; |
276 const std::string current_data_ufrag = "current_data_ufrag"; | 276 const std::string current_data_ufrag = "current_data_ufrag"; |
(...skipping 2742 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3019 ::testing::Combine( | 3019 ::testing::Combine( |
3020 ::testing::Values(cricket::MD_SENDONLY, | 3020 ::testing::Values(cricket::MD_SENDONLY, |
3021 cricket::MD_RECVONLY, | 3021 cricket::MD_RECVONLY, |
3022 cricket::MD_SENDRECV, | 3022 cricket::MD_SENDRECV, |
3023 cricket::MD_INACTIVE), | 3023 cricket::MD_INACTIVE), |
3024 ::testing::Values(cricket::MD_SENDONLY, | 3024 ::testing::Values(cricket::MD_SENDONLY, |
3025 cricket::MD_RECVONLY, | 3025 cricket::MD_RECVONLY, |
3026 cricket::MD_SENDRECV, | 3026 cricket::MD_SENDRECV, |
3027 cricket::MD_INACTIVE), | 3027 cricket::MD_INACTIVE), |
3028 ::testing::Bool())); | 3028 ::testing::Bool())); |
OLD | NEW |