From e920351798259994fea80910d12cf377ab09d022 Mon Sep 17 00:00:00 2001
From: Steve Anton <steveanton@webrtc.org>
Date: Tue, 18 Dec 2018 16:29:34 -0800
Subject: [PATCH] Update PeerConnectionProxy to reflect new
 PeerConnectionInterface methods

Bug: webrtc:10133
Change-Id: I0fa62d7265b3a101e7c55695fca47b72d7fabf58
Reviewed-on: https://webrtc-review.googlesource.com/c/114913
Reviewed-by: Seth Hampson <shampson@webrtc.org>
Commit-Queue: Steve Anton <steveanton@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#26060}
---
 api/peerconnectionproxy.h | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/api/peerconnectionproxy.h b/api/peerconnectionproxy.h
index 9637c0aae7..e69efc04ed 100644
--- a/api/peerconnectionproxy.h
+++ b/api/peerconnectionproxy.h
@@ -31,8 +31,9 @@ PROXY_METHOD1(void, RemoveStream, MediaStreamInterface*)
 PROXY_METHOD2(RTCErrorOr<rtc::scoped_refptr<RtpSenderInterface>>,
               AddTrack,
               rtc::scoped_refptr<MediaStreamTrackInterface>,
-              const std::vector<std::string>&);
+              const std::vector<std::string>&)
 PROXY_METHOD1(bool, RemoveTrack, RtpSenderInterface*)
+PROXY_METHOD1(RTCError, RemoveTrackNew, rtc::scoped_refptr<RtpSenderInterface>)
 PROXY_METHOD1(RTCErrorOr<rtc::scoped_refptr<RtpTransceiverInterface>>,
               AddTransceiver,
               rtc::scoped_refptr<MediaStreamTrackInterface>)
@@ -66,25 +67,25 @@ PROXY_METHOD1(void, GetStats, RTCStatsCollectorCallback*)
 PROXY_METHOD2(void,
               GetStats,
               rtc::scoped_refptr<RtpSenderInterface>,
-              rtc::scoped_refptr<RTCStatsCollectorCallback>);
+              rtc::scoped_refptr<RTCStatsCollectorCallback>)
 PROXY_METHOD2(void,
               GetStats,
               rtc::scoped_refptr<RtpReceiverInterface>,
-              rtc::scoped_refptr<RTCStatsCollectorCallback>);
+              rtc::scoped_refptr<RTCStatsCollectorCallback>)
 PROXY_METHOD2(rtc::scoped_refptr<DataChannelInterface>,
               CreateDataChannel,
               const std::string&,
               const DataChannelInit*)
 PROXY_CONSTMETHOD0(const SessionDescriptionInterface*, local_description)
 PROXY_CONSTMETHOD0(const SessionDescriptionInterface*, remote_description)
-PROXY_CONSTMETHOD0(const SessionDescriptionInterface*,
-                   pending_local_description)
-PROXY_CONSTMETHOD0(const SessionDescriptionInterface*,
-                   pending_remote_description)
 PROXY_CONSTMETHOD0(const SessionDescriptionInterface*,
                    current_local_description)
 PROXY_CONSTMETHOD0(const SessionDescriptionInterface*,
                    current_remote_description)
+PROXY_CONSTMETHOD0(const SessionDescriptionInterface*,
+                   pending_local_description)
+PROXY_CONSTMETHOD0(const SessionDescriptionInterface*,
+                   pending_remote_description)
 PROXY_METHOD2(void,
               CreateOffer,
               CreateSessionDescriptionObserver*,
@@ -104,36 +105,36 @@ PROXY_METHOD2(void,
 PROXY_METHOD2(void,
               SetRemoteDescription,
               std::unique_ptr<SessionDescriptionInterface>,
-              rtc::scoped_refptr<SetRemoteDescriptionObserverInterface>);
-PROXY_METHOD0(PeerConnectionInterface::RTCConfiguration, GetConfiguration);
+              rtc::scoped_refptr<SetRemoteDescriptionObserverInterface>)
+PROXY_METHOD0(PeerConnectionInterface::RTCConfiguration, GetConfiguration)
 PROXY_METHOD2(bool,
               SetConfiguration,
               const PeerConnectionInterface::RTCConfiguration&,
-              RTCError*);
+              RTCError*)
 PROXY_METHOD1(bool,
               SetConfiguration,
-              const PeerConnectionInterface::RTCConfiguration&);
+              const PeerConnectionInterface::RTCConfiguration&)
 PROXY_METHOD1(bool, AddIceCandidate, const IceCandidateInterface*)
-PROXY_METHOD1(bool,
-              RemoveIceCandidates,
-              const std::vector<cricket::Candidate>&);
+PROXY_METHOD1(bool, RemoveIceCandidates, const std::vector<cricket::Candidate>&)
+PROXY_METHOD1(RTCError, SetBitrate, const BitrateSettings&)
+PROXY_METHOD1(void,
+              SetBitrateAllocationStrategy,
+              std::unique_ptr<rtc::BitrateAllocationStrategy>)
 PROXY_METHOD1(void, SetAudioPlayout, bool)
 PROXY_METHOD1(void, SetAudioRecording, bool)
 PROXY_METHOD1(rtc::scoped_refptr<DtlsTransportInterface>,
               LookupDtlsTransportByMid,
               const std::string&)
-PROXY_METHOD1(RTCError, SetBitrate, const BitrateSettings&);
-PROXY_METHOD1(void,
-              SetBitrateAllocationStrategy,
-              std::unique_ptr<rtc::BitrateAllocationStrategy>);
 PROXY_METHOD0(SignalingState, signaling_state)
 PROXY_METHOD0(IceConnectionState, ice_connection_state)
+PROXY_METHOD0(IceConnectionState, standardized_ice_connection_state)
+PROXY_METHOD0(PeerConnectionState, peer_connection_state)
 PROXY_METHOD0(IceGatheringState, ice_gathering_state)
 PROXY_METHOD2(bool, StartRtcEventLog, rtc::PlatformFile, int64_t)
 PROXY_METHOD2(bool,
               StartRtcEventLog,
               std::unique_ptr<RtcEventLogOutput>,
-              int64_t);
+              int64_t)
 PROXY_METHOD0(void, StopRtcEventLog)
 PROXY_METHOD0(void, Close)
 END_PROXY_MAP()