| Index: talk/app/webrtc/peerconnectionfactory.h
|
| diff --git a/talk/app/webrtc/peerconnectionfactory.h b/talk/app/webrtc/peerconnectionfactory.h
|
| index d6bf03f3d1e9f4f3c08c42e2185e0b7918f605ca..0ee73b1688ae1b964ef7e173d1fbbf3a2922c8a9 100644
|
| --- a/talk/app/webrtc/peerconnectionfactory.h
|
| +++ b/talk/app/webrtc/peerconnectionfactory.h
|
| @@ -46,13 +46,22 @@ class PeerConnectionFactory : public PeerConnectionFactoryInterface {
|
| options_ = options;
|
| }
|
|
|
| + // This method takes the ownership of |dtls_identity_service|.
|
| virtual rtc::scoped_refptr<PeerConnectionInterface>
|
| CreatePeerConnection(
|
| const PeerConnectionInterface::RTCConfiguration& configuration,
|
| const MediaConstraintsInterface* constraints,
|
| PortAllocatorFactoryInterface* allocator_factory,
|
| DTLSIdentityServiceInterface* dtls_identity_service,
|
| - PeerConnectionObserver* observer);
|
| + PeerConnectionObserver* observer) override;
|
| +
|
| + virtual rtc::scoped_refptr<PeerConnectionInterface>
|
| + CreatePeerConnection(
|
| + const PeerConnectionInterface::RTCConfiguration& configuration,
|
| + const MediaConstraintsInterface* constraints,
|
| + PortAllocatorFactoryInterface* allocator_factory,
|
| + rtc::scoped_refptr<DtlsCertificate> certificate,
|
| + PeerConnectionObserver* observer) override;
|
|
|
| bool Initialize();
|
|
|
| @@ -92,6 +101,8 @@ class PeerConnectionFactory : public PeerConnectionFactoryInterface {
|
| virtual ~PeerConnectionFactory();
|
|
|
| private:
|
| + PortAllocatorFactoryInterface* CreatePeerConnectionCommon(
|
| + PortAllocatorFactoryInterface* allocator_factory);
|
| cricket::MediaEngineInterface* CreateMediaEngine_w();
|
|
|
| bool owns_ptrs_;
|
|
|