| Index: webrtc/api/peerconnectionfactoryproxy.h
|
| diff --git a/webrtc/api/peerconnectionfactoryproxy.h b/webrtc/api/peerconnectionfactoryproxy.h
|
| index a25e93b4f55b07b2a8329f1d01408ac0465930c7..14633fe1ec17feba5401e0327a7abb55b9d62511 100644
|
| --- a/webrtc/api/peerconnectionfactoryproxy.h
|
| +++ b/webrtc/api/peerconnectionfactoryproxy.h
|
| @@ -20,7 +20,7 @@
|
|
|
| namespace webrtc {
|
|
|
| -BEGIN_PROXY_MAP(PeerConnectionFactory)
|
| +BEGIN_SIGNALLING_PROXY_MAP(PeerConnectionFactory)
|
| PROXY_METHOD1(void, SetOptions, const Options&)
|
| // Can't use PROXY_METHOD5 because scoped_ptr must be moved.
|
| // TODO(tommi,hbos): Use of templates to support scoped_ptr?
|
| @@ -32,8 +32,9 @@ BEGIN_PROXY_MAP(PeerConnectionFactory)
|
| PeerConnectionObserver* a5) override {
|
| return signaling_thread_
|
| ->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>(
|
| - rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot,
|
| - this, a1, a2, a3.release(), a4.release(), a5));
|
| + rtc::Bind(
|
| + &PeerConnectionFactorySignallingProxy::CreatePeerConnection_ot,
|
| + this, a1, a2, a3.release(), a4.release(), a5));
|
| }
|
| rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
|
| const PeerConnectionInterface::RTCConfiguration& a1,
|
| @@ -42,8 +43,9 @@ BEGIN_PROXY_MAP(PeerConnectionFactory)
|
| PeerConnectionObserver* a5) override {
|
| return signaling_thread_
|
| ->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>(
|
| - rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot,
|
| - this, a1, a3.release(), a4.release(), a5));
|
| + rtc::Bind(
|
| + &PeerConnectionFactorySignallingProxy::CreatePeerConnection_ot,
|
| + this, a1, a3.release(), a4.release(), a5));
|
| }
|
| PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>,
|
| CreateLocalMediaStream, const std::string&)
|
| @@ -93,7 +95,7 @@ BEGIN_PROXY_MAP(PeerConnectionFactory)
|
| return c_->CreatePeerConnection(a1, std::move(ptr_a3), std::move(ptr_a4),
|
| a5);
|
| }
|
| - END_PROXY()
|
| + END_SIGNALLING_PROXY()
|
|
|
| } // namespace webrtc
|
|
|
|
|