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

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

Issue 2729373002: Remove HAVE_SRTP define and unmaintained code. (Closed)
Patch Set: Created 3 years, 9 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/srtpfilter.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" 15 #include "webrtc/base/checks.h"
16 #include "webrtc/base/fakesslidentity.h" 16 #include "webrtc/base/fakesslidentity.h"
17 #include "webrtc/base/gunit.h" 17 #include "webrtc/base/gunit.h"
18 #include "webrtc/base/messagedigest.h" 18 #include "webrtc/base/messagedigest.h"
19 #include "webrtc/base/ssladapter.h" 19 #include "webrtc/base/ssladapter.h"
20 #include "webrtc/media/base/codec.h" 20 #include "webrtc/media/base/codec.h"
21 #include "webrtc/media/base/testutils.h" 21 #include "webrtc/media/base/testutils.h"
22 #include "webrtc/p2p/base/p2pconstants.h" 22 #include "webrtc/p2p/base/p2pconstants.h"
23 #include "webrtc/p2p/base/transportdescription.h" 23 #include "webrtc/p2p/base/transportdescription.h"
24 #include "webrtc/p2p/base/transportinfo.h" 24 #include "webrtc/p2p/base/transportinfo.h"
25 #include "webrtc/pc/mediasession.h" 25 #include "webrtc/pc/mediasession.h"
26 #include "webrtc/pc/srtpfilter.h" 26 #include "webrtc/pc/srtpfilter.h"
27 27
28 #ifdef HAVE_SRTP
29 #define ASSERT_CRYPTO(cd, s, cs) \ 28 #define ASSERT_CRYPTO(cd, s, cs) \
30 ASSERT_EQ(s, cd->cryptos().size()); \ 29 ASSERT_EQ(s, cd->cryptos().size()); \
31 ASSERT_EQ(std::string(cs), cd->cryptos()[0].cipher_suite) 30 ASSERT_EQ(std::string(cs), cd->cryptos()[0].cipher_suite)
32 #else
33 #define ASSERT_CRYPTO(cd, s, cs) ASSERT_EQ(0, cd->cryptos().size());
34 #endif
35 31
36 typedef std::vector<cricket::Candidate> Candidates; 32 typedef std::vector<cricket::Candidate> Candidates;
37 33
38 using cricket::MediaContentDescription; 34 using cricket::MediaContentDescription;
39 using cricket::MediaSessionDescriptionFactory; 35 using cricket::MediaSessionDescriptionFactory;
40 using cricket::MediaContentDirection; 36 using cricket::MediaContentDirection;
41 using cricket::MediaSessionOptions; 37 using cricket::MediaSessionOptions;
42 using cricket::MediaType; 38 using cricket::MediaType;
43 using cricket::SessionDescription; 39 using cricket::SessionDescription;
44 using cricket::SsrcGroup; 40 using cricket::SsrcGroup;
(...skipping 2978 matching lines...) Expand 10 before | Expand all | Expand 10 after
3023 ::testing::Combine( 3019 ::testing::Combine(
3024 ::testing::Values(cricket::MD_SENDONLY, 3020 ::testing::Values(cricket::MD_SENDONLY,
3025 cricket::MD_RECVONLY, 3021 cricket::MD_RECVONLY,
3026 cricket::MD_SENDRECV, 3022 cricket::MD_SENDRECV,
3027 cricket::MD_INACTIVE), 3023 cricket::MD_INACTIVE),
3028 ::testing::Values(cricket::MD_SENDONLY, 3024 ::testing::Values(cricket::MD_SENDONLY,
3029 cricket::MD_RECVONLY, 3025 cricket::MD_RECVONLY,
3030 cricket::MD_SENDRECV, 3026 cricket::MD_SENDRECV,
3031 cricket::MD_INACTIVE), 3027 cricket::MD_INACTIVE),
3032 ::testing::Bool())); 3028 ::testing::Bool()));
OLDNEW
« no previous file with comments | « webrtc/pc/mediasession.cc ('k') | webrtc/pc/srtpfilter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698