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

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

Issue 1750593002: Rename constants files in webrtc/{media,p2p} (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removed cricket naming Created 4 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') | no next file » | 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 <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "webrtc/base/fakesslidentity.h" 14 #include "webrtc/base/fakesslidentity.h"
15 #include "webrtc/base/gunit.h" 15 #include "webrtc/base/gunit.h"
16 #include "webrtc/base/messagedigest.h" 16 #include "webrtc/base/messagedigest.h"
17 #include "webrtc/base/ssladapter.h" 17 #include "webrtc/base/ssladapter.h"
18 #include "webrtc/media/base/codec.h" 18 #include "webrtc/media/base/codec.h"
19 #include "webrtc/media/base/testutils.h" 19 #include "webrtc/media/base/testutils.h"
20 #include "webrtc/p2p/base/constants.h" 20 #include "webrtc/p2p/base/p2pconstants.h"
21 #include "webrtc/p2p/base/transportdescription.h" 21 #include "webrtc/p2p/base/transportdescription.h"
22 #include "webrtc/p2p/base/transportinfo.h" 22 #include "webrtc/p2p/base/transportinfo.h"
23 #include "webrtc/pc/mediasession.h" 23 #include "webrtc/pc/mediasession.h"
24 #include "webrtc/pc/srtpfilter.h" 24 #include "webrtc/pc/srtpfilter.h"
25 25
26 #ifdef HAVE_SRTP 26 #ifdef HAVE_SRTP
27 #define ASSERT_CRYPTO(cd, s, cs) \ 27 #define ASSERT_CRYPTO(cd, s, cs) \
28 ASSERT_EQ(cricket::CT_NONE, cd->crypto_required()); \ 28 ASSERT_EQ(cricket::CT_NONE, cd->crypto_required()); \
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)
(...skipping 2287 matching lines...) Expand 10 before | Expand all | Expand 10 after
2318 const ContentInfo* audio_content = GetFirstAudioContent(updated_offer.get()); 2318 const ContentInfo* audio_content = GetFirstAudioContent(updated_offer.get());
2319 const ContentInfo* video_content = GetFirstVideoContent(updated_offer.get()); 2319 const ContentInfo* video_content = GetFirstVideoContent(updated_offer.get());
2320 const ContentInfo* data_content = GetFirstDataContent(updated_offer.get()); 2320 const ContentInfo* data_content = GetFirstDataContent(updated_offer.get());
2321 ASSERT_TRUE(audio_content != nullptr); 2321 ASSERT_TRUE(audio_content != nullptr);
2322 ASSERT_TRUE(video_content != nullptr); 2322 ASSERT_TRUE(video_content != nullptr);
2323 ASSERT_TRUE(data_content != nullptr); 2323 ASSERT_TRUE(data_content != nullptr);
2324 EXPECT_EQ("audio_modified", audio_content->name); 2324 EXPECT_EQ("audio_modified", audio_content->name);
2325 EXPECT_EQ("video_modified", video_content->name); 2325 EXPECT_EQ("video_modified", video_content->name);
2326 EXPECT_EQ("data_modified", data_content->name); 2326 EXPECT_EQ("data_modified", data_content->name);
2327 } 2327 }
OLDNEW
« no previous file with comments | « webrtc/pc/mediasession.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698