From faaaa87960019b27a61b33cbc1e038b12eeb541d Mon Sep 17 00:00:00 2001 From: Harald Alvestrand Date: Fri, 27 Nov 2020 11:30:21 +0000 Subject: [PATCH] Remember the proxies CL that should have been part of CL 195541 Bug: webrtc:12238 Change-Id: I3ab7a7a5f0d0bfdbc00904a01444acda02d49e90 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/195543 Reviewed-by: Karl Wiberg Commit-Queue: Harald Alvestrand Cr-Commit-Position: refs/heads/master@{#32712} --- api/peer_connection_factory_proxy.h | 4 ++++ api/test/mock_peer_connection_factory_interface.h | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/api/peer_connection_factory_proxy.h b/api/peer_connection_factory_proxy.h index e33fb457ae..be098e34d8 100644 --- a/api/peer_connection_factory_proxy.h +++ b/api/peer_connection_factory_proxy.h @@ -36,6 +36,10 @@ PROXY_METHOD2(rtc::scoped_refptr, CreatePeerConnection, const PeerConnectionInterface::RTCConfiguration&, PeerConnectionDependencies) +PROXY_METHOD2(RTCErrorOr>, + CreatePeerConnectionOrError, + const PeerConnectionInterface::RTCConfiguration&, + PeerConnectionDependencies) PROXY_CONSTMETHOD1(webrtc::RtpCapabilities, GetRtpSenderCapabilities, cricket::MediaType) diff --git a/api/test/mock_peer_connection_factory_interface.h b/api/test/mock_peer_connection_factory_interface.h index 7319cebbcc..c2f2435fb8 100644 --- a/api/test/mock_peer_connection_factory_interface.h +++ b/api/test/mock_peer_connection_factory_interface.h @@ -32,6 +32,11 @@ class MockPeerConnectionFactoryInterface final (const PeerConnectionInterface::RTCConfiguration&, PeerConnectionDependencies), (override)); + MOCK_METHOD(RTCErrorOr>, + CreatePeerConnectionOrError, + (const PeerConnectionInterface::RTCConfiguration&, + PeerConnectionDependencies), + (override)); MOCK_METHOD(rtc::scoped_refptr, CreatePeerConnection, (const PeerConnectionInterface::RTCConfiguration&,