Use scoped_refptr for On(Add|Remove)Stream and OnDataChannel.

webrtc/api/peerconnection.cc

 /*
  *  Copyright 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 1131 matching lines @@
     if (rtc::starts_with(data_desc->protocol().data(),
                          cricket::kMediaProtocolRtpPrefix)) {
       UpdateRemoteRtpDataChannels(GetActiveStreams(data_desc));
     }
   }
 
   // Iterate new_streams and notify the observer about new MediaStreams.
   for (size_t i = 0; i < new_streams->count(); ++i) {
     MediaStreamInterface* new_stream = new_streams->at(i);
     stats_->AddStream(new_stream);
+    // Call both the raw pointer and scoped_refptr versions of the method
+    // for compatibility.
     observer_->OnAddStream(new_stream);
+    observer_->OnAddStream(
+        rtc::scoped_refptr<MediaStreamInterface>(new_stream));
   }
 
   UpdateEndedRemoteMediaStreams();
 
   SetSessionDescriptionMsg* msg = new SetSessionDescriptionMsg(observer);
   signaling_thread()->Post(this, MSG_SET_SESSIONDESCRIPTION_SUCCESS, msg);
 }
 
 bool PeerConnection::SetConfiguration(const RTCConfiguration& config) {
   TRACE_EVENT0("webrtc", "PeerConnection::SetConfiguration");
@@ skipping 541 matching lines @@
 
 void PeerConnection::UpdateEndedRemoteMediaStreams() {
   std::vector<rtc::scoped_refptr<MediaStreamInterface>> streams_to_remove;
   for (size_t i = 0; i < remote_streams_->count(); ++i) {
     MediaStreamInterface* stream = remote_streams_->at(i);
     if (stream->GetAudioTracks().empty() && stream->GetVideoTracks().empty()) {
       streams_to_remove.push_back(stream);
     }
   }
 
-  for (const auto& stream : streams_to_remove) {
+  for (auto& stream : streams_to_remove) {
     remote_streams_->RemoveStream(stream);
-    observer_->OnRemoveStream(stream);
+    // Call both the raw pointer and scoped_refptr versions of the method
+    // for compatibility.
+    observer_->OnRemoveStream(stream.get());
+    observer_->OnRemoveStream(std::move(stream));
   }
 }
 
 void PeerConnection::UpdateLocalTracks(
     const std::vector<cricket::StreamParams>& streams,
     cricket::MediaType media_type) {
   TrackInfos* current_tracks = GetLocalTracks(media_type);
 
   // Find removed tracks. I.e., tracks where the track id, stream label or ssrc
   // don't match the new StreamParam.
@@ skipping 150 matching lines @@
 void PeerConnection::CreateRemoteRtpDataChannel(const std::string& label,
                                                 uint32_t remote_ssrc) {
   rtc::scoped_refptr<DataChannel> channel(
       InternalCreateDataChannel(label, nullptr));
   if (!channel.get()) {
     LOG(LS_WARNING) << "Remote peer requested a DataChannel but"
                     << "CreateDataChannel failed.";
     return;
   }
   channel->SetReceiveSsrc(remote_ssrc);
-  observer_->OnDataChannel(
-      DataChannelProxy::Create(signaling_thread(), channel));
+  auto proxy_channel = DataChannelProxy::Create(signaling_thread(), channel);
+  // Call both the raw pointer and scoped_refptr versions of the method
+  // for compatibility.
+  observer_->OnDataChannel(proxy_channel.get());
+  observer_->OnDataChannel(std::move(proxy_channel));
 }
 
 rtc::scoped_refptr<DataChannel> PeerConnection::InternalCreateDataChannel(
     const std::string& label,
     const InternalDataChannelInit* config) {
   if (IsClosed()) {
     return nullptr;
   }
   if (session_->data_channel_type() == cricket::DCT_NONE) {
     LOG(LS_ERROR)
@@ skipping 109 matching lines @@
 void PeerConnection::OnDataChannelOpenMessage(
     const std::string& label,
     const InternalDataChannelInit& config) {
   rtc::scoped_refptr<DataChannel> channel(
       InternalCreateDataChannel(label, &config));
   if (!channel.get()) {
     LOG(LS_ERROR) << "Failed to create DataChannel from the OPEN message.";
     return;
   }
 
-  observer_->OnDataChannel(
-      DataChannelProxy::Create(signaling_thread(), channel));
+  auto proxy_channel = DataChannelProxy::Create(signaling_thread(), channel);
+  // Call both the raw pointer and scoped_refptr versions of the method
+  // for compatibility.
+  observer_->OnDataChannel(proxy_channel.get());
+  observer_->OnDataChannel(std::move(proxy_channel));
 }
 
 RtpSenderInterface* PeerConnection::FindSenderById(const std::string& id) {
   auto it =
       std::find_if(senders_.begin(), senders_.end(),
                    [id](const rtc::scoped_refptr<RtpSenderInterface>& sender) {
                      return sender->id() == id;
                    });
   return it != senders_.end() ? it->get() : nullptr;
 }
@@ skipping 48 matching lines @@
 DataChannel* PeerConnection::FindDataChannelBySid(int sid) const {
   for (const auto& channel : sctp_data_channels_) {
     if (channel->id() == sid) {
       return channel;
     }
   }
   return nullptr;
 }
 
 }  // namespace webrtc