| Index: webrtc/api/peerconnectionfactoryproxy.h
|
| diff --git a/webrtc/api/peerconnectionfactoryproxy.h b/webrtc/api/peerconnectionfactoryproxy.h
|
| index e829cca64910a66db38253f38509970b949b28d6..dd784f5025a6339bdecb830f618ac1ca2f826050 100644
|
| --- a/webrtc/api/peerconnectionfactoryproxy.h
|
| +++ b/webrtc/api/peerconnectionfactoryproxy.h
|
| @@ -25,6 +25,11 @@ namespace webrtc {
|
| // are called on is an implementation detail.
|
| BEGIN_SIGNALING_PROXY_MAP(PeerConnectionFactory)
|
| PROXY_SIGNALING_THREAD_DESTRUCTOR()
|
| + // Use the overloads of CreateVideoSource that take raw VideoCapturer
|
| + // pointers from PeerConnectionFactoryInterface.
|
| + // TODO(deadbeef): Remove this using statement once those overloads are
|
| + // removed.
|
| + using PeerConnectionFactoryInterface::CreateVideoSource;
|
| PROXY_METHOD1(void, SetOptions, const Options&)
|
| PROXY_METHOD5(rtc::scoped_refptr<PeerConnectionInterface>,
|
| CreatePeerConnection,
|
| @@ -48,11 +53,11 @@ BEGIN_SIGNALING_PROXY_MAP(PeerConnectionFactory)
|
| const cricket::AudioOptions&)
|
| PROXY_METHOD2(rtc::scoped_refptr<VideoTrackSourceInterface>,
|
| CreateVideoSource,
|
| - cricket::VideoCapturer*,
|
| + std::unique_ptr<cricket::VideoCapturer>,
|
| const MediaConstraintsInterface*)
|
| PROXY_METHOD1(rtc::scoped_refptr<VideoTrackSourceInterface>,
|
| CreateVideoSource,
|
| - cricket::VideoCapturer*)
|
| + std::unique_ptr<cricket::VideoCapturer>)
|
| PROXY_METHOD2(rtc::scoped_refptr<VideoTrackInterface>,
|
| CreateVideoTrack,
|
| const std::string&,
|
|
|