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

Unified Diff: webrtc/pc/channel_unittest.cc

Issue 2537343003: Removing "crypto_required" from MediaContentDescription. (Closed)
Patch Set: Merge with master and clean up CreateDataChannel Created 4 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/pc/channel.cc ('k') | webrtc/pc/channelmanager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/pc/channel_unittest.cc
diff --git a/webrtc/pc/channel_unittest.cc b/webrtc/pc/channel_unittest.cc
index 85a7e697a8406323ebace8104872f3b91e65fae9..5de3c945558fabd40402021529697d07f34b66c4 100644
--- a/webrtc/pc/channel_unittest.cc
+++ b/webrtc/pc/channel_unittest.cc
@@ -190,10 +190,9 @@ class ChannelTest : public testing::Test, public sigslot::has_slots<> {
typename T::MediaChannel* ch,
cricket::TransportController* transport_controller,
int flags) {
- typename T::Channel* channel =
- new typename T::Channel(worker_thread, network_thread, engine, ch,
- transport_controller, cricket::CN_AUDIO,
- (flags & RTCP) != 0);
+ typename T::Channel* channel = new typename T::Channel(
+ worker_thread, network_thread, engine, ch, transport_controller,
+ cricket::CN_AUDIO, (flags & RTCP) != 0, (flags & SECURE) != 0);
rtc::CryptoOptions crypto_options;
crypto_options.enable_gcm_crypto_suites = (flags & GCM_CIPHER) != 0;
channel->SetCryptoOptions(crypto_options);
@@ -2042,10 +2041,9 @@ cricket::VideoChannel* ChannelTest<VideoTraits>::CreateChannel(
cricket::FakeVideoMediaChannel* ch,
cricket::TransportController* transport_controller,
int flags) {
- cricket::VideoChannel* channel =
- new cricket::VideoChannel(worker_thread, network_thread, ch,
- transport_controller, cricket::CN_VIDEO,
- (flags & RTCP) != 0);
+ cricket::VideoChannel* channel = new cricket::VideoChannel(
+ worker_thread, network_thread, ch, transport_controller,
+ cricket::CN_VIDEO, (flags & RTCP) != 0, (flags & SECURE) != 0);
rtc::CryptoOptions crypto_options;
crypto_options.enable_gcm_crypto_suites = (flags & GCM_CIPHER) != 0;
channel->SetCryptoOptions(crypto_options);
@@ -3315,10 +3313,9 @@ cricket::DataChannel* ChannelTest<DataTraits>::CreateChannel(
cricket::FakeDataMediaChannel* ch,
cricket::TransportController* transport_controller,
int flags) {
- cricket::DataChannel* channel =
- new cricket::DataChannel(worker_thread, network_thread, ch,
- transport_controller, cricket::CN_DATA,
- (flags & RTCP) != 0);
+ cricket::DataChannel* channel = new cricket::DataChannel(
+ worker_thread, network_thread, ch, transport_controller, cricket::CN_DATA,
+ (flags & RTCP) != 0, (flags & SECURE) != 0);
rtc::CryptoOptions crypto_options;
crypto_options.enable_gcm_crypto_suites = (flags & GCM_CIPHER) != 0;
channel->SetCryptoOptions(crypto_options);
« no previous file with comments | « webrtc/pc/channel.cc ('k') | webrtc/pc/channelmanager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698