commit 2d6c76aa39d510f7fe22aa871f02c4ff86302ab8
author Steve Anton <steveanton@webrtc.org> Sat Jan 06 01:10:52 2018
committer Commit Bot <commit-bot@chromium.org> Sat Jan 06 02:01:39 2018
tree ed6b76cf7b104ef184232bbd6aefe1b8e65482d8
parent 43a723a71b3df5a54bfd1868283ce29226c50828

Switch to using AddTrack with stream labels

Bug: webrtc:8587
Change-Id: I8d4a3a225e6f6a6ae59def972ecae3255c0f2bda
Reviewed-on: https://webrtc-review.googlesource.com/37547
Commit-Queue: Steve Anton <steveanton@webrtc.org>
Reviewed-by: Peter Thatcher <pthatcher@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21509}

pc/peerconnection.cc

diff --git a/pc/peerconnection.cc b/pc/peerconnection.cc
index 78fcf1d..020f3c3 100644
--- a/pc/peerconnection.cc
+++ b/pc/peerconnection.cc
@@ -1009,18 +1009,17 @@
     }
     stream_labels.push_back(stream->label());
   }
-  auto sender_or_error = AddTrackWithStreamLabels(track, stream_labels);
+  auto sender_or_error = AddTrack(track, stream_labels);
   if (!sender_or_error.ok()) {
     return nullptr;
   }
   return sender_or_error.MoveValue();
 }
 
-RTCErrorOr<rtc::scoped_refptr<RtpSenderInterface>>
-PeerConnection::AddTrackWithStreamLabels(
+RTCErrorOr<rtc::scoped_refptr<RtpSenderInterface>> PeerConnection::AddTrack(
     rtc::scoped_refptr<MediaStreamTrackInterface> track,
     const std::vector<std::string>& stream_labels) {
-  TRACE_EVENT0("webrtc", "PeerConnection::AddTrackWithStreamLabels");
+  TRACE_EVENT0("webrtc", "PeerConnection::AddTrack");
   if (!track) {
     LOG_AND_RETURN_ERROR(RTCErrorType::INVALID_PARAMETER, "Track is null.");
   }