commit 13b8bad23543c59e57428a642aa31a24f0923d76
author Seth Hampson <shampson@webrtc.org> Tue Mar 13 16:05:28 2018 -0700
committer Commit Bot <commit-bot@chromium.org> Wed Mar 14 20:30:52 2018 +0000
tree 8be0eb2a4827aa107bcfac9a803a351c404fd33a
parent 097085140e8258a1e3a3ff73c1725e5163c04b93

Final name changing of MediaStreamInterface.label() to id().

Downstreams have been updated, and this now updates all uses of label()
to id() within WebRTC code. This change also makes id() pure virtual and
removes label().

Bug: webrtc:8977
Change-Id: Ib045ea4fabba6f14447c64875c7aeba87dc2be24
Reviewed-on: https://webrtc-review.googlesource.com/60382
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
Commit-Queue: Seth Hampson <shampson@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22431}

api/mediastreaminterface.cc

diff --git a/api/mediastreaminterface.cc b/api/mediastreaminterface.cc
index 3d4eb66..6f08a0c 100644
--- a/api/mediastreaminterface.cc
+++ b/api/mediastreaminterface.cc
@@ -58,15 +58,4 @@
   return nullptr;
 }
 
-// TODO(shampson): Remove this once downstreams are using id().
-std::string MediaStreamInterface::label() const {
-  return id();
-}
-
-// TODO(shampson): Remove this default implementation once downstreams have
-// implemented.
-std::string MediaStreamInterface::id() const {
-  return std::string();
-}
-
 }  // namespace webrtc

api/mediastreaminterface.h

diff --git a/api/mediastreaminterface.h b/api/mediastreaminterface.h
index e2412de..2e2cff0 100644
--- a/api/mediastreaminterface.h
+++ b/api/mediastreaminterface.h
@@ -313,10 +313,7 @@
 class MediaStreamInterface : public rtc::RefCountInterface,
                              public NotifierInterface {
  public:
-  // TODO(shampson): Remove once downstreams are updated to use id().
-  virtual std::string label() const;
-  // TODO(shampson): Make pure virtual once downstreams have implemented.
-  virtual std::string id() const;
+  virtual std::string id() const = 0;
 
   virtual AudioTrackVector GetAudioTracks() = 0;
   virtual VideoTrackVector GetVideoTracks() = 0;

api/mediastreamproxy.h

diff --git a/api/mediastreamproxy.h b/api/mediastreamproxy.h
index 848b75b..3f261db 100644
--- a/api/mediastreamproxy.h
+++ b/api/mediastreamproxy.h
@@ -22,7 +22,6 @@
 // are called on is an implementation detail.
 BEGIN_SIGNALING_PROXY_MAP(MediaStream)
   PROXY_SIGNALING_THREAD_DESTRUCTOR()
-  PROXY_CONSTMETHOD0(std::string, label)
   PROXY_CONSTMETHOD0(std::string, id)
   PROXY_METHOD0(AudioTrackVector, GetAudioTracks)
   PROXY_METHOD0(VideoTrackVector, GetVideoTracks)