Revert of Add the OnAddTrack callback for Objective-C wrapper.

webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm

Index: webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm
diff --git a/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm b/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm
index e9428d3b9585d0184b412bd7ee7c1509dc85e122..de7608c3b9941dd1acffc6b8e8dc0d5c52211379 100644
--- a/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm
+++ b/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm
@@ -27,7 +27,6 @@
 
 #include "webrtc/api/jsepicecandidate.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/sdk/objc/Framework/Classes/helpers.h"
 
 NSString * const kRTCPeerConnectionErrorDomain =
     @"org.webrtc.RTCPeerConnection";
@@ -128,8 +127,9 @@
 
 void PeerConnectionDelegateAdapter::OnAddStream(
     rtc::scoped_refptr<MediaStreamInterface> stream) {
-  RTCPeerConnection *peer_connection = peer_connection_;
-  RTCMediaStream *mediaStream = [peer_connection mediaStreamForNativeStream:stream];
+  RTCMediaStream *mediaStream =
+      [[RTCMediaStream alloc] initWithNativeMediaStream:stream];
+  RTCPeerConnection *peer_connection = peer_connection_;
   [peer_connection.delegate peerConnection:peer_connection
                               didAddStream:mediaStream];
 }
@@ -141,7 +141,6 @@
   RTCPeerConnection *peer_connection = peer_connection_;
   [peer_connection.delegate peerConnection:peer_connection
                            didRemoveStream:mediaStream];
-  [peer_connection removeNativeMediaStream:stream];
 }
 
 void PeerConnectionDelegateAdapter::OnDataChannel(
@@ -201,28 +200,6 @@
                     didRemoveIceCandidates:ice_candidates];
 }
 
-void PeerConnectionDelegateAdapter::OnAddTrack(
-    rtc::scoped_refptr<RtpReceiverInterface> receiver,
-    const std::vector<rtc::scoped_refptr<MediaStreamInterface>>& streams) {
-  RTCRtpReceiver* rtpReceiver =
-      [[RTCRtpReceiver alloc] initWithNativeRtpReceiver:receiver];
-  NSMutableArray* mediaStreams =
-      [NSMutableArray arrayWithCapacity:streams.size()];
-
-  RTCPeerConnection* peer_connection = peer_connection_;
-  for (const auto stream : streams) {
-    RTCMediaStream* mediaStream =
-        [peer_connection mediaStreamForNativeStream:stream];
-    [mediaStreams addObject:mediaStream];
-  }
-  if ([peer_connection.delegate
-      respondsToSelector:@selector(peerConnection:didAddTrack:streams:)]) {
-    [peer_connection.delegate peerConnection:peer_connection
-                                 didAddTrack:rtpReceiver
-                                     streams:mediaStreams];
-  }
-}
-
 }  // namespace webrtc
 
 
@@ -232,7 +209,6 @@
   rtc::scoped_refptr<webrtc::PeerConnectionInterface> _peerConnection;
   std::unique_ptr<webrtc::MediaConstraints> _nativeConstraints;
   BOOL _hasStartedRtcEventLog;
-  NSMutableDictionary<NSString *, RTCMediaStream *> *_mediaStreamsByStreamId;
 }
 
 @synthesize delegate = _delegate;
@@ -262,7 +238,6 @@
     }
     _localStreams = [[NSMutableArray alloc] init];
     _delegate = delegate;
-    _mediaStreamsByStreamId = [NSMutableDictionary dictionary];
   }
   return self;
 }
@@ -613,21 +588,6 @@
   }
 }
 
-- (RTCMediaStream *)mediaStreamForNativeStream:
-    (rtc::scoped_refptr<webrtc::MediaStreamInterface>)stream {
-  RTCMediaStream *mediaStream =
-      _mediaStreamsByStreamId[[NSString stringForStdString:stream->label()]];
-  if (!mediaStream) {
-    mediaStream = [[RTCMediaStream alloc] initWithNativeMediaStream:stream.get()];
-    _mediaStreamsByStreamId[[NSString stringForStdString:stream->label()]] = mediaStream;
-  }
-  return mediaStream;
-}
-
-- (void)removeNativeMediaStream:(rtc::scoped_refptr<webrtc::MediaStreamInterface>)stream {
-  [_mediaStreamsByStreamId removeObjectForKey:[NSString stringForStdString:stream->label()]];
-}
-
 - (rtc::scoped_refptr<webrtc::PeerConnectionInterface>)nativePeerConnection {
   return _peerConnection;
 }