Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Side by Side Diff: webrtc/api/jsepsessiondescription_unittest.cc

Issue 1610243002: Move talk/app/webrtc to webrtc/api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removed processing of api.gyp for Chromium builds Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/api/jsepsessiondescription.cc ('k') | webrtc/api/localaudiosource.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
11 * this list of conditions and the following disclaimer in the documentation 11 * this list of conditions and the following disclaimer in the documentation
12 * and/or other materials provided with the distribution. 12 * and/or other materials provided with the distribution.
13 * 3. The name of the author may not be used to endorse or promote products 13 * 3. The name of the author may not be used to endorse or promote products
14 * derived from this software without specific prior written permission. 14 * derived from this software without specific prior written permission.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #include <string> 28 #include <string>
29 29
30 #include "talk/app/webrtc/jsepicecandidate.h" 30 #include "webrtc/api/jsepicecandidate.h"
31 #include "talk/app/webrtc/jsepsessiondescription.h" 31 #include "webrtc/api/jsepsessiondescription.h"
32 #include "talk/session/media/mediasession.h" 32 #include "talk/session/media/mediasession.h"
33 #include "webrtc/base/gunit.h" 33 #include "webrtc/base/gunit.h"
34 #include "webrtc/base/helpers.h" 34 #include "webrtc/base/helpers.h"
35 #include "webrtc/base/scoped_ptr.h" 35 #include "webrtc/base/scoped_ptr.h"
36 #include "webrtc/base/ssladapter.h" 36 #include "webrtc/base/ssladapter.h"
37 #include "webrtc/base/stringencode.h" 37 #include "webrtc/base/stringencode.h"
38 #include "webrtc/p2p/base/candidate.h" 38 #include "webrtc/p2p/base/candidate.h"
39 #include "webrtc/p2p/base/constants.h" 39 #include "webrtc/p2p/base/constants.h"
40 #include "webrtc/p2p/base/sessiondescription.h" 40 #include "webrtc/p2p/base/sessiondescription.h"
41 41
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 EXPECT_TRUE(jsep_desc_->AddCandidate(&jsep_candidate)); 229 EXPECT_TRUE(jsep_desc_->AddCandidate(&jsep_candidate));
230 std::string sdp_with_candidate = Serialize(jsep_desc_.get()); 230 std::string sdp_with_candidate = Serialize(jsep_desc_.get());
231 EXPECT_NE(sdp, sdp_with_candidate); 231 EXPECT_NE(sdp, sdp_with_candidate);
232 232
233 scoped_ptr<SessionDescriptionInterface> parsed_jsep_desc( 233 scoped_ptr<SessionDescriptionInterface> parsed_jsep_desc(
234 DeSerialize(sdp_with_candidate)); 234 DeSerialize(sdp_with_candidate));
235 std::string parsed_sdp_with_candidate = Serialize(parsed_jsep_desc.get()); 235 std::string parsed_sdp_with_candidate = Serialize(parsed_jsep_desc.get());
236 236
237 EXPECT_EQ(sdp_with_candidate, parsed_sdp_with_candidate); 237 EXPECT_EQ(sdp_with_candidate, parsed_sdp_with_candidate);
238 } 238 }
OLDNEW
« no previous file with comments | « webrtc/api/jsepsessiondescription.cc ('k') | webrtc/api/localaudiosource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698