| 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 |
| 11 #include <string> | 11 #include <string> |
| 12 | 12 |
| 13 #include "webrtc/api/jsepicecandidate.h" | 13 #include "webrtc/api/jsepicecandidate.h" |
| 14 #include "webrtc/api/jsepsessiondescription.h" | 14 #include "webrtc/api/jsepsessiondescription.h" |
| 15 #include "talk/session/media/mediasession.h" | |
| 16 #include "webrtc/base/gunit.h" | 15 #include "webrtc/base/gunit.h" |
| 17 #include "webrtc/base/helpers.h" | 16 #include "webrtc/base/helpers.h" |
| 18 #include "webrtc/base/scoped_ptr.h" | 17 #include "webrtc/base/scoped_ptr.h" |
| 19 #include "webrtc/base/ssladapter.h" | 18 #include "webrtc/base/ssladapter.h" |
| 20 #include "webrtc/base/stringencode.h" | 19 #include "webrtc/base/stringencode.h" |
| 21 #include "webrtc/p2p/base/candidate.h" | 20 #include "webrtc/p2p/base/candidate.h" |
| 22 #include "webrtc/p2p/base/constants.h" | 21 #include "webrtc/p2p/base/constants.h" |
| 23 #include "webrtc/p2p/base/sessiondescription.h" | 22 #include "webrtc/p2p/base/sessiondescription.h" |
| 23 #include "webrtc/pc/mediasession.h" |
| 24 | 24 |
| 25 using webrtc::IceCandidateCollection; | 25 using webrtc::IceCandidateCollection; |
| 26 using webrtc::IceCandidateInterface; | 26 using webrtc::IceCandidateInterface; |
| 27 using webrtc::JsepIceCandidate; | 27 using webrtc::JsepIceCandidate; |
| 28 using webrtc::JsepSessionDescription; | 28 using webrtc::JsepSessionDescription; |
| 29 using webrtc::SessionDescriptionInterface; | 29 using webrtc::SessionDescriptionInterface; |
| 30 using rtc::scoped_ptr; | 30 using rtc::scoped_ptr; |
| 31 | 31 |
| 32 static const char kCandidateUfrag[] = "ufrag"; | 32 static const char kCandidateUfrag[] = "ufrag"; |
| 33 static const char kCandidatePwd[] = "pwd"; | 33 static const char kCandidatePwd[] = "pwd"; |
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 EXPECT_TRUE(jsep_desc_->AddCandidate(&jsep_candidate)); | 212 EXPECT_TRUE(jsep_desc_->AddCandidate(&jsep_candidate)); |
| 213 std::string sdp_with_candidate = Serialize(jsep_desc_.get()); | 213 std::string sdp_with_candidate = Serialize(jsep_desc_.get()); |
| 214 EXPECT_NE(sdp, sdp_with_candidate); | 214 EXPECT_NE(sdp, sdp_with_candidate); |
| 215 | 215 |
| 216 scoped_ptr<SessionDescriptionInterface> parsed_jsep_desc( | 216 scoped_ptr<SessionDescriptionInterface> parsed_jsep_desc( |
| 217 DeSerialize(sdp_with_candidate)); | 217 DeSerialize(sdp_with_candidate)); |
| 218 std::string parsed_sdp_with_candidate = Serialize(parsed_jsep_desc.get()); | 218 std::string parsed_sdp_with_candidate = Serialize(parsed_jsep_desc.get()); |
| 219 | 219 |
| 220 EXPECT_EQ(sdp_with_candidate, parsed_sdp_with_candidate); | 220 EXPECT_EQ(sdp_with_candidate, parsed_sdp_with_candidate); |
| 221 } | 221 } |
| OLD | NEW |