Revert of Fixing scenario where track is rejected and later un-rejected.

talk/app/webrtc/mediastreamhandler.cc

Index: talk/app/webrtc/mediastreamhandler.cc
diff --git a/talk/app/webrtc/mediastreamhandler.cc b/talk/app/webrtc/mediastreamhandler.cc
index 08be35ec865e080bccffc76368f934aa7f343035..f68699d6298c40bc6c6e111035ad6abc362652df 100644
--- a/talk/app/webrtc/mediastreamhandler.cc
+++ b/talk/app/webrtc/mediastreamhandler.cc
@@ -90,7 +90,7 @@
       audio_track_(track),
       provider_(provider),
       sink_adapter_(new LocalAudioSinkAdapter()) {
-  Start();
+  OnEnabledChanged();
   track->AddSink(sink_adapter_.get());
 }
 
@@ -99,10 +99,6 @@
 
 void LocalAudioTrackHandler::OnStateChanged() {
   // TODO(perkj): What should happen when the state change?
-}
-
-void LocalAudioTrackHandler::Start() {
-  OnEnabledChanged();
 }
 
 void LocalAudioTrackHandler::Stop() {
@@ -136,17 +132,11 @@
       audio_track_(track),
       provider_(provider) {
   track->GetSource()->RegisterAudioObserver(this);
-  Start();
+  OnEnabledChanged();
 }
 
 RemoteAudioTrackHandler::~RemoteAudioTrackHandler() {
   audio_track_->GetSource()->UnregisterAudioObserver(this);
-}
-
-void RemoteAudioTrackHandler::Start() {
-  // TODO(deadbeef) - Should we remember the audio playout volume last set,
-  // and set it again in case the audio channel was destroyed and recreated?
-  OnEnabledChanged();
 }
 
 void RemoteAudioTrackHandler::Stop() {
@@ -176,20 +166,16 @@
     : TrackHandler(track, ssrc),
       local_video_track_(track),
       provider_(provider) {
-  Start();
-}
-
-LocalVideoTrackHandler::~LocalVideoTrackHandler() {
-}
-
-void LocalVideoTrackHandler::OnStateChanged() {
-}
-
-void LocalVideoTrackHandler::Start() {
   VideoSourceInterface* source = local_video_track_->GetSource();
   if (source)
-    provider_->SetCaptureDevice(ssrc(), source->GetVideoCapturer());
+    provider_->SetCaptureDevice(ssrc, source->GetVideoCapturer());
   OnEnabledChanged();
+}
+
+LocalVideoTrackHandler::~LocalVideoTrackHandler() {
+}
+
+void LocalVideoTrackHandler::OnStateChanged() {
 }
 
 void LocalVideoTrackHandler::Stop() {
@@ -213,16 +199,12 @@
     : TrackHandler(track, ssrc),
       remote_video_track_(track),
       provider_(provider) {
-  Start();
+  OnEnabledChanged();
+  provider_->SetVideoPlayout(ssrc, true,
+                             remote_video_track_->GetSource()->FrameInput());
 }
 
 RemoteVideoTrackHandler::~RemoteVideoTrackHandler() {
-}
-
-void RemoteVideoTrackHandler::Start() {
-  OnEnabledChanged();
-  provider_->SetVideoPlayout(ssrc(), true,
-                             remote_video_track_->GetSource()->FrameInput());
 }
 
 void RemoteVideoTrackHandler::Stop() {
@@ -319,12 +301,6 @@
   track_handlers_.push_back(handler);
 }
 
-void LocalMediaStreamHandler::RestartAllTracks() {
-  for (auto it : track_handlers_) {
-    it->Start();
-  }
-}
-
 RemoteMediaStreamHandler::RemoteMediaStreamHandler(
     MediaStreamInterface* stream,
     AudioProviderInterface* audio_provider,
@@ -351,12 +327,6 @@
   track_handlers_.push_back(handler);
 }
 
-void RemoteMediaStreamHandler::RestartAllTracks() {
-  for (auto it : track_handlers_) {
-    it->Start();
-  }
-}
-
 MediaStreamHandlerContainer::MediaStreamHandlerContainer(
     AudioProviderInterface* audio_provider,
     VideoProviderInterface* video_provider)
@@ -426,12 +396,6 @@
   handler->RemoveTrack(track);
 }
 
-void MediaStreamHandlerContainer::RestartAllRemoteTracks() {
-  for (auto it : remote_streams_handlers_) {
-    it->RestartAllTracks();
-  }
-}
-
 void MediaStreamHandlerContainer::RemoveLocalStream(
     MediaStreamInterface* stream) {
   DeleteStreamHandler(&local_streams_handlers_, stream);
@@ -472,12 +436,6 @@
     return;
   }
   handler->RemoveTrack(track);
-}
-
-void MediaStreamHandlerContainer::RestartAllLocalTracks() {
-  for (auto it : local_streams_handlers_) {
-    it->RestartAllTracks();
-  }
 }
 
 MediaStreamHandler* MediaStreamHandlerContainer::CreateRemoteStreamHandler(