Clean up WebMediaStream API

This is now possible after switching most of Blink to operate over
MediaStreamDescriptor directly.

BUG=704136, 919392
R=guidou@chromium.org, haraken@chromium.org

Change-Id: I1bbce476fb6b83e37ad99723fe799ad94fd8236f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2284962Reviewed-by: Kentaro Hara <haraken@chromium.org>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Commit-Queue: Antonio Gomes <tonikitoo@igalia.com>
Cr-Commit-Position: refs/heads/master@{#786226}

third_party/blink/public/platform/modules/mediastream/web_media_stream.h

@@ -62,22 +62,12 @@ class WebMediaStream {
 
   BLINK_PLATFORM_EXPORT void Assign(const WebMediaStream&);
 
-  BLINK_PLATFORM_EXPORT void Initialize(
-      const WebVector<WebMediaStreamTrack>& audio_tracks,
-      const WebVector<WebMediaStreamTrack>& video_tracks);
-  BLINK_PLATFORM_EXPORT void Initialize(
-      const WebString& label,
-      const WebVector<WebMediaStreamTrack>& audio_tracks,
-      const WebVector<WebMediaStreamTrack>& video_tracks);
-
   BLINK_PLATFORM_EXPORT void Reset();
   bool IsNull() const { return private_.IsNull(); }
 
   BLINK_PLATFORM_EXPORT WebString Id() const;
   BLINK_PLATFORM_EXPORT int UniqueId() const;
 
-  BLINK_PLATFORM_EXPORT WebVector<WebMediaStreamTrack> AudioTracks() const;
-  BLINK_PLATFORM_EXPORT WebVector<WebMediaStreamTrack> VideoTracks() const;
   // If a track is not found with the specified id, the returned track's
   // |IsNull| will return true.
   BLINK_PLATFORM_EXPORT WebMediaStreamTrack
@@ -85,9 +75,6 @@ class WebMediaStream {
   BLINK_PLATFORM_EXPORT WebMediaStreamTrack
   GetVideoTrack(const WebString& track_id) const;
 
-  BLINK_PLATFORM_EXPORT void AddTrack(const WebMediaStreamTrack&);
-  BLINK_PLATFORM_EXPORT void RemoveTrack(const WebMediaStreamTrack&);
-
   // These methods add/remove an observer to/from this WebMediaStream. The
   // caller is responsible for removing the observer before the destruction of
   // the WebMediaStream. Observers cannot be null, cannot be added or removed
@@ -97,7 +84,7 @@ class WebMediaStream {
   BLINK_PLATFORM_EXPORT void RemoveObserver(WebMediaStreamObserver*);
 
 #if INSIDE_BLINK
-  BLINK_PLATFORM_EXPORT WebMediaStream(MediaStreamDescriptor*);
+  BLINK_PLATFORM_EXPORT explicit WebMediaStream(MediaStreamDescriptor*);
   BLINK_PLATFORM_EXPORT operator MediaStreamDescriptor*() const;
   BLINK_PLATFORM_EXPORT WebMediaStream& operator=(MediaStreamDescriptor*);
 #endif

third_party/blink/renderer/platform/exported/mediastream/web_media_stream.cc

@@ -52,58 +52,6 @@ int WebMediaStream::UniqueId() const {
   return private_->UniqueId();
 }
 
-WebVector<WebMediaStreamTrack> WebMediaStream::AudioTracks() const {
-  size_t number_of_tracks = private_->NumberOfAudioComponents();
-  WebVector<WebMediaStreamTrack> result(number_of_tracks);
-  for (size_t i = 0; i < number_of_tracks; ++i)
-    result[i] = private_->AudioComponent(i);
-  return result;
-}
-
-WebVector<WebMediaStreamTrack> WebMediaStream::VideoTracks() const {
-  size_t number_of_tracks = private_->NumberOfVideoComponents();
-  WebVector<WebMediaStreamTrack> result(number_of_tracks);
-  for (size_t i = 0; i < number_of_tracks; ++i)
-    result[i] = private_->VideoComponent(i);
-  return result;
-}
-
-WebMediaStreamTrack WebMediaStream::GetAudioTrack(
-    const WebString& track_id) const {
-  size_t number_of_tracks = private_->NumberOfAudioComponents();
-  String id = track_id;
-  for (size_t i = 0; i < number_of_tracks; ++i) {
-    MediaStreamComponent* audio_component = private_->AudioComponent(i);
-    DCHECK(audio_component);
-    if (audio_component->Id() == id)
-      return WebMediaStreamTrack(private_->AudioComponent(i));
-  }
-  return WebMediaStreamTrack();
-}
-
-WebMediaStreamTrack WebMediaStream::GetVideoTrack(
-    const WebString& track_id) const {
-  size_t number_of_tracks = private_->NumberOfVideoComponents();
-  String id = track_id;
-  for (size_t i = 0; i < number_of_tracks; ++i) {
-    MediaStreamComponent* video_component = private_->VideoComponent(i);
-    DCHECK(video_component);
-    if (video_component->Id() == id)
-      return WebMediaStreamTrack(private_->VideoComponent(i));
-  }
-  return WebMediaStreamTrack();
-}
-
-void WebMediaStream::AddTrack(const WebMediaStreamTrack& track) {
-  DCHECK(!IsNull());
-  private_->AddRemoteTrack(track);
-}
-
-void WebMediaStream::RemoveTrack(const WebMediaStreamTrack& track) {
-  DCHECK(!IsNull());
-  private_->RemoveRemoteTrack(track);
-}
-
 void WebMediaStream::AddObserver(WebMediaStreamObserver* observer) {
   DCHECK(!IsNull());
   private_->AddObserver(observer);
@@ -124,28 +72,6 @@ WebMediaStream::operator MediaStreamDescriptor*() const {
   return private_.Get();
 }
 
-void WebMediaStream::Initialize(
-    const WebVector<WebMediaStreamTrack>& audio_tracks,
-    const WebVector<WebMediaStreamTrack>& video_tracks) {
-  Initialize(WTF::CreateCanonicalUUIDString(), audio_tracks, video_tracks);
-}
-
-void WebMediaStream::Initialize(
-    const WebString& label,
-    const WebVector<WebMediaStreamTrack>& audio_tracks,
-    const WebVector<WebMediaStreamTrack>& video_tracks) {
-  MediaStreamComponentVector audio, video;
-  for (size_t i = 0; i < audio_tracks.size(); ++i) {
-    MediaStreamComponent* component = audio_tracks[i];
-    audio.push_back(component);
-  }
-  for (size_t i = 0; i < video_tracks.size(); ++i) {
-    MediaStreamComponent* component = video_tracks[i];
-    video.push_back(component);
-  }
-  private_ = MakeGarbageCollected<MediaStreamDescriptor>(label, audio, video);
-}
-
 void WebMediaStream::Assign(const WebMediaStream& other) {
   private_ = other.private_;
 }