commit d5f41ce89899abf47cd015ccc52524d467e0eb44
author deadbeef <deadbeef@webrtc.org> Wed Jun 08 13:31:45 2016 -0700
committer Commit bot <commit-bot@chromium.org> Wed Jun 08 20:31:54 2016 +0000
tree 83a41a4a00d9042cfba97140b31cbf12e44d3cb0
parent 73fbcf9237b1109283ef590b24188b1d64144358

Use the new versions of OnAddStream/OnRemoveStream in objc binding.

Review-Url: https://codereview.webrtc.org/2049153002
Cr-Commit-Position: refs/heads/master@{#13078}

webrtc/sdk/objc/Framework/Classes/RTCPeerConnection+Private.h

diff --git a/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection+Private.h b/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection+Private.h
index 92bdfa3..60ab868 100644
--- a/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection+Private.h
+++ b/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection+Private.h
@@ -29,11 +29,12 @@
   void OnSignalingChange(
       PeerConnectionInterface::SignalingState new_state) override;
 
-  void OnAddStream(MediaStreamInterface *stream) override;
+  void OnAddStream(rtc::scoped_refptr<MediaStreamInterface> stream) override;
 
-  void OnRemoveStream(MediaStreamInterface *stream) override;
+  void OnRemoveStream(rtc::scoped_refptr<MediaStreamInterface> stream) override;
 
-  void OnDataChannel(DataChannelInterface *data_channel) override;
+  void OnDataChannel(
+      rtc::scoped_refptr<DataChannelInterface> data_channel) override;
 
   void OnRenegotiationNeeded() override;
 

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 3fcc652..68d2387 100644
--- a/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm
+++ b/webrtc/sdk/objc/Framework/Classes/RTCPeerConnection.mm
@@ -126,7 +126,7 @@
 }
 
 void PeerConnectionDelegateAdapter::OnAddStream(
-    MediaStreamInterface *stream) {
+    rtc::scoped_refptr<MediaStreamInterface> stream) {
   RTCMediaStream *mediaStream =
       [[RTCMediaStream alloc] initWithNativeMediaStream:stream];
   RTCPeerConnection *peer_connection = peer_connection_;
@@ -135,7 +135,7 @@
 }
 
 void PeerConnectionDelegateAdapter::OnRemoveStream(
-    MediaStreamInterface *stream) {
+    rtc::scoped_refptr<MediaStreamInterface> stream) {
   RTCMediaStream *mediaStream =
       [[RTCMediaStream alloc] initWithNativeMediaStream:stream];
   RTCPeerConnection *peer_connection = peer_connection_;
@@ -144,7 +144,7 @@
 }
 
 void PeerConnectionDelegateAdapter::OnDataChannel(
-    DataChannelInterface *data_channel) {
+    rtc::scoped_refptr<DataChannelInterface> data_channel) {
   RTCDataChannel *dataChannel =
       [[RTCDataChannel alloc] initWithNativeDataChannel:data_channel];
   RTCPeerConnection *peer_connection = peer_connection_;