Change UserMediaClient to operator over MediaStreamComponent

.... instead of WebMediaStreamTracker.

This is part of the effort to reduce the needless use of
public Blink APIs (wrappers) within renderer/modules.

BUG=704136
R=guidou@chromium.org

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

third_party/blink/renderer/modules/mediastream/user_media_client.cc

@@ -50,20 +50,19 @@ UserMediaClient::Request::Request(UserMediaRequest* user_media_request)
     : user_media_request_(user_media_request) {
   DCHECK(user_media_request_);
   DCHECK(!apply_constraints_request_);
-  DCHECK(web_track_to_stop_.IsNull());
+  DCHECK(!track_to_stop_);
 }
 
 UserMediaClient::Request::Request(blink::ApplyConstraintsRequest* request)
     : apply_constraints_request_(request) {
   DCHECK(apply_constraints_request_);
   DCHECK(!user_media_request_);
-  DCHECK(web_track_to_stop_.IsNull());
+  DCHECK(!track_to_stop_);
 }
 
-UserMediaClient::Request::Request(
-    const blink::WebMediaStreamTrack& web_track_to_stop)
-    : web_track_to_stop_(web_track_to_stop) {
-  DCHECK(!web_track_to_stop_.IsNull());
+UserMediaClient::Request::Request(MediaStreamComponent* track_to_stop)
+    : track_to_stop_(track_to_stop) {
+  DCHECK(track_to_stop_);
   DCHECK(!user_media_request_);
   DCHECK(!apply_constraints_request_);
 }
@@ -184,8 +183,8 @@ void UserMediaClient::ApplyConstraints(
     MaybeProcessNextRequestInfo();
 }
 
-void UserMediaClient::StopTrack(const blink::WebMediaStreamTrack& web_track) {
-  pending_request_infos_.push_back(MakeGarbageCollected<Request>(web_track));
+void UserMediaClient::StopTrack(MediaStreamComponent* track) {
+  pending_request_infos_.push_back(MakeGarbageCollected<Request>(track));
   if (!is_processing_request_)
     MaybeProcessNextRequestInfo();
 }
@@ -217,7 +216,7 @@ void UserMediaClient::MaybeProcessNextRequestInfo() {
     DCHECK(current_request->IsStopTrack());
     blink::WebPlatformMediaStreamTrack* track =
         blink::WebPlatformMediaStreamTrack::GetTrack(
-            current_request->web_track_to_stop());
+            current_request->track_to_stop());
     if (track) {
       track->StopAndNotify(WTF::Bind(&UserMediaClient::CurrentRequestCompleted,
                                      WrapWeakPersistent(this)));

third_party/blink/renderer/modules/mediastream/user_media_client.h

@@ -18,6 +18,7 @@
 #include "third_party/blink/renderer/modules/mediastream/user_media_processor.h"
 #include "third_party/blink/renderer/modules/mediastream/user_media_request.h"
 #include "third_party/blink/renderer/modules/modules_export.h"
+#include "third_party/blink/renderer/platform/mediastream/media_stream_component.h"
 #include "third_party/blink/renderer/platform/mojo/heap_mojo_remote.h"
 #include "third_party/blink/renderer/platform/mojo/heap_mojo_wrapper_mode.h"
 #include "third_party/blink/renderer/platform/wtf/deque.h"
@@ -51,7 +52,7 @@ class MODULES_EXPORT UserMediaClient
   void RequestUserMedia(UserMediaRequest* user_media_request);
   void CancelUserMediaRequest(UserMediaRequest* user_media_request);
   void ApplyConstraints(blink::ApplyConstraintsRequest* user_media_request);
-  void StopTrack(const blink::WebMediaStreamTrack& web_track);
+  void StopTrack(MediaStreamComponent* track);
   void ContextDestroyed();
 
   bool IsCapturing();
@@ -67,7 +68,7 @@ class MODULES_EXPORT UserMediaClient
    public:
     explicit Request(UserMediaRequest* request);
     explicit Request(blink::ApplyConstraintsRequest* request);
-    explicit Request(const blink::WebMediaStreamTrack& request);
+    explicit Request(MediaStreamComponent* request);
     ~Request();
 
     UserMediaRequest* MoveUserMediaRequest();
@@ -76,23 +77,22 @@ class MODULES_EXPORT UserMediaClient
     blink::ApplyConstraintsRequest* apply_constraints_request() const {
       return apply_constraints_request_;
     }
-    const blink::WebMediaStreamTrack& web_track_to_stop() const {
-      return web_track_to_stop_;
-    }
+    MediaStreamComponent* track_to_stop() const { return track_to_stop_; }
 
     bool IsUserMedia() const { return !!user_media_request_; }
-    bool IsApplyConstraints() const { return apply_constraints_request_; }
-    bool IsStopTrack() const { return !web_track_to_stop_.IsNull(); }
+    bool IsApplyConstraints() const { return !!apply_constraints_request_; }
+    bool IsStopTrack() const { return !!track_to_stop_; }
 
     void Trace(Visitor* visitor) const {
       visitor->Trace(user_media_request_);
       visitor->Trace(apply_constraints_request_);
+      visitor->Trace(track_to_stop_);
     }
 
    private:
     Member<UserMediaRequest> user_media_request_;
     Member<blink::ApplyConstraintsRequest> apply_constraints_request_;
-    blink::WebMediaStreamTrack web_track_to_stop_;
+    Member<MediaStreamComponent> track_to_stop_;
 
     DISALLOW_COPY_AND_ASSIGN(Request);
   };

third_party/blink/renderer/modules/mediastream/user_media_controller.h

@@ -82,7 +82,7 @@ inline void UserMediaController::ApplyConstraints(
 }
 
 inline void UserMediaController::StopTrack(MediaStreamComponent* track) {
-  Client()->StopTrack(WebMediaStreamTrack(track));
+  Client()->StopTrack(track);
 }
 
 inline bool UserMediaController::HasRequestedUserMedia() {