Name changing of MediaStreamInterface.label() to id().

We are deprecating label() and moving to using id() for consistency and
spec compliance. This is part of the effort to support to multiple media
stream ids in webrtc.

Bug: webrtc:8977
Change-Id: Iab6a8930f26d4c00a3a5153dd1cac85b3b4b5730
Reviewed-on: https://chromium-review.googlesource.com/953165Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
Commit-Queue: Seth Hampson <shampson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542292}

content/renderer/media/webrtc/mock_peer_connection_dependency_factory.cc

@@ -40,7 +40,7 @@ static typename V::iterator FindTrack(V* vector,
   return it;
 };
 
-MockMediaStream::MockMediaStream(const std::string& label) : label_(label) {}
+MockMediaStream::MockMediaStream(const std::string& id) : id_(id) {}
 
 bool MockMediaStream::AddTrack(AudioTrackInterface* track) {
   audio_track_vector_.push_back(track);
@@ -74,8 +74,8 @@ bool MockMediaStream::RemoveTrack(VideoTrackInterface* track) {
   return true;
 }
 
-std::string MockMediaStream::label() const {
-  return label_;
+std::string MockMediaStream::id() const {
+  return id_;
 }
 
 AudioTrackVector MockMediaStream::GetAudioTracks() {

content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h

@@ -86,13 +86,13 @@ class MockWebRtcVideoTrack : public webrtc::VideoTrackInterface {
 
 class MockMediaStream : public webrtc::MediaStreamInterface {
  public:
-  explicit MockMediaStream(const std::string& label);
+  explicit MockMediaStream(const std::string& id);
 
   bool AddTrack(webrtc::AudioTrackInterface* track) override;
   bool AddTrack(webrtc::VideoTrackInterface* track) override;
   bool RemoveTrack(webrtc::AudioTrackInterface* track) override;
   bool RemoveTrack(webrtc::VideoTrackInterface* track) override;
-  std::string label() const override;
+  std::string id() const override;
   webrtc::AudioTrackVector GetAudioTracks() override;
   webrtc::VideoTrackVector GetVideoTracks() override;
   rtc::scoped_refptr<webrtc::AudioTrackInterface> FindAudioTrack(
@@ -108,7 +108,7 @@ class MockMediaStream : public webrtc::MediaStreamInterface {
  private:
   void NotifyObservers();
 
-  std::string label_;
+  std::string id_;
   webrtc::AudioTrackVector audio_track_vector_;
   webrtc::VideoTrackVector video_track_vector_;
 

content/renderer/media/webrtc/mock_peer_connection_impl.cc

@@ -31,9 +31,9 @@ class MockStreamCollection : public webrtc::StreamCollectionInterface {
  public:
   size_t count() override { return streams_.size(); }
   MediaStreamInterface* at(size_t index) override { return streams_[index]; }
-  MediaStreamInterface* find(const std::string& label) override {
+  MediaStreamInterface* find(const std::string& id) override {
     for (size_t i = 0; i < streams_.size(); ++i) {
-      if (streams_[i]->label() == label)
+      if (streams_[i]->id() == id)
         return streams_[i];
     }
     return nullptr;
@@ -277,8 +277,8 @@ rtc::scoped_refptr<webrtc::RtpSenderInterface> MockPeerConnectionImpl::AddTrack(
       return nullptr;
   }
   for (auto* stream : streams) {
-    if (!local_streams_->find(stream->label())) {
-      stream_label_ = stream->label();
+    if (!local_streams_->find(stream->id())) {
+      stream_label_ = stream->id();
       local_streams_->AddStream(stream);
     }
   }

remoting/protocol/webrtc_connection_to_host.cc

@@ -151,7 +151,7 @@ void WebrtcConnectionToHost::OnWebrtcTransportIncomingDataChannel(
 void WebrtcConnectionToHost::OnWebrtcTransportMediaStreamAdded(
     scoped_refptr<webrtc::MediaStreamInterface> stream) {
   if (stream->GetVideoTracks().size() > 0) {
-    GetOrCreateVideoAdapter(stream->label())->SetMediaStream(stream);
+    GetOrCreateVideoAdapter(stream->id())->SetMediaStream(stream);
   } else if (stream->GetAudioTracks().size() > 0) {
     audio_adapter_.reset(new WebrtcAudioSinkAdapter(stream, audio_consumer_));
   } else {
@@ -161,7 +161,7 @@ void WebrtcConnectionToHost::OnWebrtcTransportMediaStreamAdded(
 
 void WebrtcConnectionToHost::OnWebrtcTransportMediaStreamRemoved(
     scoped_refptr<webrtc::MediaStreamInterface> stream) {
-  if (video_adapter_ && video_adapter_->label() == stream->label())
+  if (video_adapter_ && video_adapter_->label() == stream->id())
     video_adapter_.reset();
 }
 

remoting/protocol/webrtc_video_renderer_adapter.cc

@@ -73,7 +73,7 @@ WebrtcVideoRendererAdapter::~WebrtcVideoRendererAdapter() {
 
 void WebrtcVideoRendererAdapter::SetMediaStream(
     scoped_refptr<webrtc::MediaStreamInterface> media_stream) {
-  DCHECK_EQ(media_stream->label(), label());
+  DCHECK_EQ(media_stream->id(), label());
 
   media_stream_ = std::move(media_stream);