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

Side by Side Diff: webrtc/pc/mediasession_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/mediasession.cc ('k') | webrtc/pc/mediastream.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 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
11 #include <memory> 11 #include <memory>
12 #include <string> 12 #include <string>
13 #include <vector> 13 #include <vector>
14 14
15 #include "webrtc/base/checks.h"
16 #include "webrtc/base/fakesslidentity.h"
17 #include "webrtc/base/gunit.h"
18 #include "webrtc/base/messagedigest.h"
19 #include "webrtc/base/ssladapter.h"
20 #include "webrtc/media/base/codec.h" 15 #include "webrtc/media/base/codec.h"
21 #include "webrtc/media/base/testutils.h" 16 #include "webrtc/media/base/testutils.h"
22 #include "webrtc/p2p/base/p2pconstants.h" 17 #include "webrtc/p2p/base/p2pconstants.h"
23 #include "webrtc/p2p/base/transportdescription.h" 18 #include "webrtc/p2p/base/transportdescription.h"
24 #include "webrtc/p2p/base/transportinfo.h" 19 #include "webrtc/p2p/base/transportinfo.h"
25 #include "webrtc/pc/mediasession.h" 20 #include "webrtc/pc/mediasession.h"
26 #include "webrtc/pc/srtpfilter.h" 21 #include "webrtc/pc/srtpfilter.h"
22 #include "webrtc/rtc_base/checks.h"
23 #include "webrtc/rtc_base/fakesslidentity.h"
24 #include "webrtc/rtc_base/gunit.h"
25 #include "webrtc/rtc_base/messagedigest.h"
26 #include "webrtc/rtc_base/ssladapter.h"
27 27
28 #define ASSERT_CRYPTO(cd, s, cs) \ 28 #define ASSERT_CRYPTO(cd, s, cs) \
29 ASSERT_EQ(s, cd->cryptos().size()); \ 29 ASSERT_EQ(s, cd->cryptos().size()); \
30 ASSERT_EQ(std::string(cs), cd->cryptos()[0].cipher_suite) 30 ASSERT_EQ(std::string(cs), cd->cryptos()[0].cipher_suite)
31 31
32 typedef std::vector<cricket::Candidate> Candidates; 32 typedef std::vector<cricket::Candidate> Candidates;
33 33
34 using cricket::MediaContentDescription; 34 using cricket::MediaContentDescription;
35 using cricket::MediaSessionDescriptionFactory; 35 using cricket::MediaSessionDescriptionFactory;
36 using cricket::MediaContentDirection; 36 using cricket::MediaContentDirection;
(...skipping 3204 matching lines...) Expand 10 before | Expand all | Expand 10 after
3241 ::testing::Combine( 3241 ::testing::Combine(
3242 ::testing::Values(cricket::MD_SENDONLY, 3242 ::testing::Values(cricket::MD_SENDONLY,
3243 cricket::MD_RECVONLY, 3243 cricket::MD_RECVONLY,
3244 cricket::MD_SENDRECV, 3244 cricket::MD_SENDRECV,
3245 cricket::MD_INACTIVE), 3245 cricket::MD_INACTIVE),
3246 ::testing::Values(cricket::MD_SENDONLY, 3246 ::testing::Values(cricket::MD_SENDONLY,
3247 cricket::MD_RECVONLY, 3247 cricket::MD_RECVONLY,
3248 cricket::MD_SENDRECV, 3248 cricket::MD_SENDRECV,
3249 cricket::MD_INACTIVE), 3249 cricket::MD_INACTIVE),
3250 ::testing::Bool())); 3250 ::testing::Bool()));
OLDNEW
« no previous file with comments | « webrtc/pc/mediasession.cc ('k') | webrtc/pc/mediastream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698