Index: webrtc/api/peerconnection.h |
diff --git a/webrtc/api/peerconnection.h b/webrtc/api/peerconnection.h |
index b5577157a6573344ba7adb432b71f9ee377636d7..029824e494cca3918b29c0c59a07d8d6fcff030a 100644 |
--- a/webrtc/api/peerconnection.h |
+++ b/webrtc/api/peerconnection.h |
@@ -131,7 +131,7 @@ class PeerConnection : public PeerConnectionInterface, |
void SetRemoteDescription(SetSessionDescriptionObserver* observer, |
SessionDescriptionInterface* desc) override; |
bool SetConfiguration( |
- const PeerConnectionInterface::RTCConfiguration& config) override; |
+ const PeerConnectionInterface::RTCConfiguration& configuration) override; |
bool AddIceCandidate(const IceCandidateInterface* candidate) override; |
bool RemoveIceCandidates( |
const std::vector<cricket::Candidate>& candidates) override; |
@@ -210,6 +210,8 @@ class PeerConnection : public PeerConnectionInterface, |
return factory_->signaling_thread(); |
} |
+ rtc::Thread* worker_thread() const { return factory_->worker_thread(); } |
+ |
void PostSetSessionDescriptionFailure(SetSessionDescriptionObserver* observer, |
const std::string& error); |
void PostCreateSessionDescriptionFailure( |
@@ -393,11 +395,7 @@ class PeerConnection : public PeerConnectionInterface, |
std::vector<rtc::scoped_refptr<RtpSenderInterface>> senders_; |
std::vector<rtc::scoped_refptr<RtpReceiverInterface>> receivers_; |
- // The session_ unique_ptr is declared at the bottom of PeerConnection |
- // because its destruction fires signals (such as VoiceChannelDestroyed) |
- // which will trigger some final actions in PeerConnection... |
std::unique_ptr<WebRtcSession> session_; |
- // ... But stats_ depends on session_ so it should be destroyed even earlier. |
std::unique_ptr<StatsCollector> stats_; |
}; |