Chromium Code Reviews| Index: webrtc/api/webrtcsession_unittest.cc |
| diff --git a/webrtc/api/webrtcsession_unittest.cc b/webrtc/api/webrtcsession_unittest.cc |
| index 16ce621eb81d5e5c26cae467708a33cf49fadc23..bcd5bbe772d23cccc9a753c28e4f67a8422983de 100644 |
| --- a/webrtc/api/webrtcsession_unittest.cc |
| +++ b/webrtc/api/webrtcsession_unittest.cc |
| @@ -370,7 +370,7 @@ class WebRtcSessionTest |
| // |dtls_identity_store|. |
| void Init( |
| rtc::scoped_ptr<webrtc::DtlsIdentityStoreInterface> dtls_identity_store, |
| - const PeerConnectionInterface::RTCConfiguration& rtc_configuration) { |
| + const PeerConnectionInterface::RTCConfiguration& rtc_configuration_in) { |
| ASSERT_TRUE(session_.get() == NULL); |
| session_.reset(new WebRtcSessionForTest( |
| media_controller_.get(), rtc::Thread::Current(), rtc::Thread::Current(), |
| @@ -385,8 +385,10 @@ class WebRtcSessionTest |
| EXPECT_EQ(PeerConnectionInterface::kIceGatheringNew, |
| observer_.ice_gathering_state_); |
| - EXPECT_TRUE(session_->Initialize(options_, constraints_.get(), |
| - std::move(dtls_identity_store), |
| + PeerConnectionInterface::RTCConfiguration rtc_configuration = |
| + rtc_configuration_in; |
| + CopyConstraintsIntoRtcConfiguration(constraints_.get(), &rtc_configuration); |
|
perkj_webrtc
2016/02/23 11:40:18
replace all use of constraints in this file since
hta-webrtc
2016/02/23 14:30:34
Unfortunately there's an awful lot of constraints
|
| + EXPECT_TRUE(session_->Initialize(options_, std::move(dtls_identity_store), |
| rtc_configuration)); |
| session_->set_metrics_observer(metrics_observer_); |
| } |
| @@ -609,7 +611,7 @@ class WebRtcSessionTest |
| = new WebRtcSessionCreateSDPObserverForTest(); |
| cricket::MediaSessionOptions session_options; |
| GetOptionsForAnswer(constraints, &session_options); |
| - session_->CreateAnswer(observer, constraints, session_options); |
| + session_->CreateAnswer(observer, session_options); |
| EXPECT_TRUE_WAIT( |
| observer->state() != WebRtcSessionCreateSDPObserverForTest::kInit, |
| 2000); |
| @@ -1362,7 +1364,7 @@ class WebRtcSessionTest |
| if (type == CreateSessionDescriptionRequest::kOffer) { |
| session_->CreateOffer(observers[i], options, session_options); |
| } else { |
| - session_->CreateAnswer(observers[i], nullptr, session_options); |
| + session_->CreateAnswer(observers[i], session_options); |
| } |
| } |