| Index: talk/app/webrtc/peerconnectionfactoryproxy.h
|
| diff --git a/talk/app/webrtc/peerconnectionfactoryproxy.h b/talk/app/webrtc/peerconnectionfactoryproxy.h
|
| index 9013ea503885af37aef29b5528c15fa87cb8a43f..1d523cebb3d85972d6e97aa5bfa6d19c8f68f099 100644
|
| --- a/talk/app/webrtc/peerconnectionfactoryproxy.h
|
| +++ b/talk/app/webrtc/peerconnectionfactoryproxy.h
|
| @@ -43,21 +43,11 @@ BEGIN_PROXY_MAP(PeerConnectionFactory)
|
| rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
|
| const PeerConnectionInterface::RTCConfiguration& a1,
|
| const MediaConstraintsInterface* a2,
|
| - PortAllocatorFactoryInterface* a3,
|
| - rtc::scoped_ptr<DtlsIdentityStoreInterface> a4,
|
| - PeerConnectionObserver* a5) override {
|
| - return owner_thread_->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>(
|
| - rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot1, this,
|
| - a1, a2, a3, a4.release(), a5));
|
| - }
|
| - rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection(
|
| - const PeerConnectionInterface::RTCConfiguration& a1,
|
| - const MediaConstraintsInterface* a2,
|
| rtc::scoped_ptr<cricket::PortAllocator> a3,
|
| rtc::scoped_ptr<DtlsIdentityStoreInterface> a4,
|
| PeerConnectionObserver* a5) override {
|
| return owner_thread_->Invoke<rtc::scoped_refptr<PeerConnectionInterface>>(
|
| - rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot2, this,
|
| + rtc::Bind(&PeerConnectionFactoryProxy::CreatePeerConnection_ot, this,
|
| a1, a2, a3.release(), a4.release(), a5));
|
| }
|
| PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>,
|
| @@ -77,17 +67,7 @@ BEGIN_PROXY_MAP(PeerConnectionFactory)
|
| PROXY_METHOD0(void, StopRtcEventLog)
|
|
|
| private:
|
| - rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot1(
|
| - const PeerConnectionInterface::RTCConfiguration& a1,
|
| - const MediaConstraintsInterface* a2,
|
| - PortAllocatorFactoryInterface* a3,
|
| - DtlsIdentityStoreInterface* a4,
|
| - PeerConnectionObserver* a5) {
|
| - rtc::scoped_ptr<DtlsIdentityStoreInterface> ptr_a4(a4);
|
| - return c_->CreatePeerConnection(a1, a2, a3, ptr_a4.Pass(), a5);
|
| - }
|
| -
|
| - rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot2(
|
| + rtc::scoped_refptr<PeerConnectionInterface> CreatePeerConnection_ot(
|
| const PeerConnectionInterface::RTCConfiguration& a1,
|
| const MediaConstraintsInterface* a2,
|
| cricket::PortAllocator* a3,
|
|
|