Split libjingle's signaling thread from the UI thread

content/renderer/media/media_stream_track.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/media_stream_track.h"
 
 #include "base/logging.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
 
 namespace content {
 
 // static
 MediaStreamTrack* MediaStreamTrack::GetTrack(
     const blink::WebMediaStreamTrack& track) {
   if (track.isNull())
     return NULL;
   return static_cast<MediaStreamTrack*>(track.extraData());
 }
 
-MediaStreamTrack::MediaStreamTrack(
-    const scoped_refptr<webrtc::MediaStreamTrackInterface>& track,
-    bool is_local_track)
-    : track_(track), is_local_track_(is_local_track) {
+MediaStreamTrack::MediaStreamTrack(bool is_local_track)
+    : is_local_track_(is_local_track) {
 }
 
 MediaStreamTrack::~MediaStreamTrack() {
 }
 
-void MediaStreamTrack::SetEnabled(bool enabled) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  if (track_.get())
-    track_->set_enabled(enabled);
-}
-
-// TODO(tommi): Remove this hack when we have a separate implementation for
-// remote media stream tracks.  Stop() can probably be made pure virtual.
-void MediaStreamTrack::Stop() {
-  DCHECK(!is_local_track_) << "Local implementations must override Stop()";
-  // Stop means that a track should be stopped permanently. But
-  // since there is no proper way of doing that on a remote track, we can
-  // at least disable the track. Blink will not call down to the content layer
-  // after a track has been stopped.
-  SetEnabled(false);
-}
-
 webrtc::AudioTrackInterface* MediaStreamTrack::GetAudioAdapter() {

[perkj_chrome, 2014/10/31 08:37:24]

Can this be pure virtual? I saw you todo in .h so just ignore if you can't.

[tommi (sloooow) - chröme, 2014/10/31 10:06:32]

Shijing has pending cleanup work for this method so I think he'll take care of
it.  There are other implementations that will need to implement this if we make
it pure virtual. As is the default implementation should never be used.

-  DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK_EQ(track_->kind(), "audio");
-  return static_cast<webrtc::AudioTrackInterface*>(track_.get());
+  NOTREACHED();
+  return nullptr;
 }
 
 }  // namespace content