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

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

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 5 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/pc/jsepsessiondescription.cc ('k') | webrtc/pc/localaudiosource_unittest.cc » ('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 * 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 <memory> 11 #include <memory>
12 #include <string> 12 #include <string>
13 13
14 #include "webrtc/api/jsepicecandidate.h" 14 #include "webrtc/api/jsepicecandidate.h"
15 #include "webrtc/api/jsepsessiondescription.h" 15 #include "webrtc/api/jsepsessiondescription.h"
16 #include "webrtc/base/gunit.h"
17 #include "webrtc/base/helpers.h"
18 #include "webrtc/base/ssladapter.h"
19 #include "webrtc/base/stringencode.h"
20 #include "webrtc/p2p/base/candidate.h" 16 #include "webrtc/p2p/base/candidate.h"
21 #include "webrtc/p2p/base/p2pconstants.h" 17 #include "webrtc/p2p/base/p2pconstants.h"
22 #include "webrtc/p2p/base/sessiondescription.h" 18 #include "webrtc/p2p/base/sessiondescription.h"
23 #include "webrtc/pc/mediasession.h" 19 #include "webrtc/pc/mediasession.h"
20 #include "webrtc/rtc_base/gunit.h"
21 #include "webrtc/rtc_base/helpers.h"
22 #include "webrtc/rtc_base/ssladapter.h"
23 #include "webrtc/rtc_base/stringencode.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 30
31 static const char kCandidateUfrag[] = "ufrag"; 31 static const char kCandidateUfrag[] = "ufrag";
32 static const char kCandidatePwd[] = "pwd"; 32 static const char kCandidatePwd[] = "pwd";
33 static const char kCandidateUfragVoice[] = "ufrag_voice"; 33 static const char kCandidateUfragVoice[] = "ufrag_voice";
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 candidates.clear(); 398 candidates.clear();
399 candidates.push_back(candidate2); 399 candidates.push_back(candidate2);
400 ASSERT_TRUE(jsep_desc_->RemoveCandidates(candidates)); 400 ASSERT_TRUE(jsep_desc_->RemoveCandidates(candidates));
401 EXPECT_EQ("[::1]:1234", media_desc->connection_address().ToString()); 401 EXPECT_EQ("[::1]:1234", media_desc->connection_address().ToString());
402 402
403 candidates.clear(); 403 candidates.clear();
404 candidates.push_back(candidate1); 404 candidates.push_back(candidate1);
405 ASSERT_TRUE(jsep_desc_->RemoveCandidates(candidates)); 405 ASSERT_TRUE(jsep_desc_->RemoveCandidates(candidates));
406 EXPECT_EQ("0.0.0.0:9", media_desc->connection_address().ToString()); 406 EXPECT_EQ("0.0.0.0:9", media_desc->connection_address().ToString());
407 } 407 }
OLDNEW
« no previous file with comments | « webrtc/pc/jsepsessiondescription.cc ('k') | webrtc/pc/localaudiosource_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698