Chromium Code Reviews| Index: talk/app/webrtc/peerconnectionfactory.h |
| diff --git a/talk/app/webrtc/peerconnectionfactory.h b/talk/app/webrtc/peerconnectionfactory.h |
| index d6bf03f3d1e9f4f3c08c42e2185e0b7918f605ca..a0e97591dadd06654deb8e8a5d55ab3cfcc8ed90 100644 |
| --- a/talk/app/webrtc/peerconnectionfactory.h |
| +++ b/talk/app/webrtc/peerconnectionfactory.h |
| @@ -30,15 +30,18 @@ |
| #include <string> |
| +#include "talk/app/webrtc/dtlsidentitystore.h" |
| #include "talk/app/webrtc/mediastreaminterface.h" |
| #include "talk/app/webrtc/peerconnectioninterface.h" |
| #include "talk/session/media/channelmanager.h" |
| #include "webrtc/base/scoped_ptr.h" |
| +#include "webrtc/base/scoped_ref_ptr.h" |
| #include "webrtc/base/thread.h" |
| namespace webrtc { |
| -class DtlsIdentityStore; |
| +typedef rtc::RefCountedObject<DtlsIdentityStoreImpl> |
| + RefCountedDtlsIdentityStore; |
| class PeerConnectionFactory : public PeerConnectionFactoryInterface { |
| public: |
| @@ -46,13 +49,14 @@ class PeerConnectionFactory : public PeerConnectionFactoryInterface { |
| options_ = options; |
| } |
| - virtual rtc::scoped_refptr<PeerConnectionInterface> |
| + // webrtc::PeerConnectionFactoryInterface override; |
| + rtc::scoped_refptr<PeerConnectionInterface> |
| CreatePeerConnection( |
| const PeerConnectionInterface::RTCConfiguration& configuration, |
| const MediaConstraintsInterface* constraints, |
| PortAllocatorFactoryInterface* allocator_factory, |
| - DTLSIdentityServiceInterface* dtls_identity_service, |
| - PeerConnectionObserver* observer); |
| + rtc::scoped_ptr<DtlsIdentityStoreInterface> dtls_identity_store, |
|
tommi
2015/06/18 13:55:36
const &
|
| + PeerConnectionObserver* observer) override; |
| bool Initialize(); |
| @@ -112,7 +116,7 @@ class PeerConnectionFactory : public PeerConnectionFactoryInterface { |
| rtc::scoped_ptr<cricket::WebRtcVideoDecoderFactory> |
| video_decoder_factory_; |
| - rtc::scoped_ptr<webrtc::DtlsIdentityStore> dtls_identity_store_; |
| + rtc::scoped_refptr<RefCountedDtlsIdentityStore> dtls_identity_store_; |
| }; |
| } // namespace webrtc |