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

Side by Side Diff: webrtc/api/test/peerconnectiontestwrapper.cc

Issue 2648003003: Revert of Removing #defines previously used for building without BoringSSL/OpenSSL. (Closed)
Patch Set: Created 3 years, 11 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/api/peerconnectioninterface_unittest.cc ('k') | webrtc/api/webrtcsession_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 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2013 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
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 } 69 }
70 70
71 peer_connection_factory_ = webrtc::CreatePeerConnectionFactory( 71 peer_connection_factory_ = webrtc::CreatePeerConnectionFactory(
72 network_thread_, worker_thread_, rtc::Thread::Current(), 72 network_thread_, worker_thread_, rtc::Thread::Current(),
73 fake_audio_capture_module_, NULL, NULL); 73 fake_audio_capture_module_, NULL, NULL);
74 if (!peer_connection_factory_) { 74 if (!peer_connection_factory_) {
75 return false; 75 return false;
76 } 76 }
77 77
78 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator( 78 std::unique_ptr<rtc::RTCCertificateGeneratorInterface> cert_generator(
79 new FakeRTCCertificateGenerator()); 79 rtc::SSLStreamAdapter::HaveDtlsSrtp() ? new FakeRTCCertificateGenerator()
80 : nullptr);
80 peer_connection_ = peer_connection_factory_->CreatePeerConnection( 81 peer_connection_ = peer_connection_factory_->CreatePeerConnection(
81 config, constraints, std::move(port_allocator), std::move(cert_generator), 82 config, constraints, std::move(port_allocator), std::move(cert_generator),
82 this); 83 this);
83 84
84 return peer_connection_.get() != NULL; 85 return peer_connection_.get() != NULL;
85 } 86 }
86 87
87 rtc::scoped_refptr<webrtc::DataChannelInterface> 88 rtc::scoped_refptr<webrtc::DataChannelInterface>
88 PeerConnectionTestWrapper::CreateDataChannel( 89 PeerConnectionTestWrapper::CreateDataChannel(
89 const std::string& label, 90 const std::string& label,
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 peer_connection_factory_->CreateVideoSource( 272 peer_connection_factory_->CreateVideoSource(
272 new webrtc::FakePeriodicVideoCapturer(), &constraints); 273 new webrtc::FakePeriodicVideoCapturer(), &constraints);
273 std::string videotrack_label = label + kVideoTrackLabelBase; 274 std::string videotrack_label = label + kVideoTrackLabelBase;
274 rtc::scoped_refptr<webrtc::VideoTrackInterface> video_track( 275 rtc::scoped_refptr<webrtc::VideoTrackInterface> video_track(
275 peer_connection_factory_->CreateVideoTrack(videotrack_label, source)); 276 peer_connection_factory_->CreateVideoTrack(videotrack_label, source));
276 277
277 stream->AddTrack(video_track); 278 stream->AddTrack(video_track);
278 } 279 }
279 return stream; 280 return stream;
280 } 281 }
OLDNEW
« no previous file with comments | « webrtc/api/peerconnectioninterface_unittest.cc ('k') | webrtc/api/webrtcsession_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698