Revert of Fix DCHECK when track status changes in non-playing state (patchset...

Revert of Fix DCHECK when track status changes in non-playing state (patchset #3 id:40001 of https://codereview.chromium.org/2269313002/ )

Reason for revert:
The new test is crashing on Mac

Original issue's description:
> Fix DCHECK when track status changes in non-playing state
>
> We are only accessing shared_state_.renderer in kPlaying state.
>
> BUG=640362
>
> Committed: https://crrev.com/5f450aa795c85f615ccaed457f3114c487df7ac4
> Cr-Commit-Position: refs/heads/master@{#416131}

TBR=avayvod@chromium.org,chcunningham@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=640362

Review-Url: https://codereview.chromium.org/2310483002
Cr-Commit-Position: refs/heads/master@{#416309}

media/base/pipeline_impl.cc

@@ -581,7 +581,7 @@ void PipelineImpl::RendererWrapper::OnEnabledAudioTracksChanged(
   }
 
   DCHECK(demuxer_);
-  DCHECK(shared_state_.renderer || (state_ != kPlaying));
+  DCHECK(shared_state_.renderer);
 
   base::TimeDelta currTime = (state_ == kPlaying)
                                  ? shared_state_.renderer->GetMediaTime()
@@ -600,7 +600,7 @@ void PipelineImpl::RendererWrapper::OnSelectedVideoTrackChanged(
   }
 
   DCHECK(demuxer_);
-  DCHECK(shared_state_.renderer || (state_ != kPlaying));
+  DCHECK(shared_state_.renderer);
 
   base::TimeDelta currTime = (state_ == kPlaying)
                                  ? shared_state_.renderer->GetMediaTime()

media/renderers/renderer_impl.cc

@@ -229,7 +229,7 @@ void RendererImpl::RestartStreamPlayback(DemuxerStream* stream,
   bool video = (stream->type() == DemuxerStream::VIDEO);
   DVLOG(1) << __func__ << (video ? " video" : " audio") << " stream=" << stream
            << " enabled=" << stream->enabled() << " time=" << time.InSecondsF();
-  if ((state_ != STATE_PLAYING) || (audio_ended_ && video_ended_))
+  if (state_ != STATE_PLAYING)
     return;
   if (stream->type() == DemuxerStream::VIDEO) {
     DCHECK(video_renderer_);

media/test/pipeline_integration_test.cc

@@ -923,10 +923,6 @@ TEST_F(PipelineIntegrationTest, BasicPlaybackHashed) {
   EXPECT_TRUE(demuxer_->GetTimelineOffset().is_null());
 }
 
-base::TimeDelta TimestampMs(int milliseconds) {
-  return base::TimeDelta::FromMilliseconds(milliseconds);
-}
-
 TEST_F(PipelineIntegrationTest, PlaybackWithAudioTrackDisabledThenEnabled) {
   ASSERT_EQ(PIPELINE_OK, Start("bear-320x240.webm", kHashed));
 
@@ -939,7 +935,7 @@ TEST_F(PipelineIntegrationTest, PlaybackWithAudioTrackDisabledThenEnabled) {
   ASSERT_TRUE(Seek(base::TimeDelta()));
 
   Play();
-  const base::TimeDelta k500ms = TimestampMs(500);
+  const base::TimeDelta k500ms = base::TimeDelta::FromMilliseconds(500);
   ASSERT_TRUE(WaitUntilCurrentTimeIsAfter(k500ms));
   Pause();
 
@@ -977,7 +973,7 @@ TEST_F(PipelineIntegrationTest, PlaybackWithVideoTrackDisabledThenEnabled) {
   ResetVideoHash();
 
   Play();
-  const base::TimeDelta k500ms = TimestampMs(500);
+  const base::TimeDelta k500ms = base::TimeDelta::FromMilliseconds(500);
   ASSERT_TRUE(WaitUntilCurrentTimeIsAfter(k500ms));
   Pause();
 
@@ -1004,64 +1000,6 @@ TEST_F(PipelineIntegrationTest, PlaybackWithVideoTrackDisabledThenEnabled) {
   EXPECT_HASH_EQ("fd59357dfd9c144ab4fb8181b2de32c3", GetVideoHash());
 }
 
-TEST_F(PipelineIntegrationTest, TrackStatusChangesAfterPipelineEnded) {
-  ASSERT_EQ(PIPELINE_OK, Start("bear-320x240.webm", kHashed));
-  Play();
-  ASSERT_TRUE(WaitUntilOnEnded());
-  std::vector<MediaTrack::Id> track_ids;
-  // Disable audio track.
-  pipeline_->OnEnabledAudioTracksChanged(track_ids);
-  // Re-enable audio track.
-  track_ids.push_back("2");
-  pipeline_->OnEnabledAudioTracksChanged(track_ids);
-  // Disable video track.
-  track_ids.clear();
-  pipeline_->OnSelectedVideoTrackChanged(track_ids);
-  // Re-enable video track.
-  track_ids.push_back("1");
-  pipeline_->OnSelectedVideoTrackChanged(track_ids);
-}
-
-TEST_F(PipelineIntegrationTest, TrackStatusChangesWhileSuspended) {
-  ASSERT_EQ(PIPELINE_OK, Start("bear-320x240.webm", kHashed));
-  Play();
-
-  ASSERT_TRUE(Suspend());
-
-  // These get triggered every time playback is resumed.
-  EXPECT_CALL(*this, OnVideoNaturalSizeChange(gfx::Size(320, 240)))
-      .Times(AnyNumber());
-  EXPECT_CALL(*this, OnVideoOpacityChange(true)).Times(AnyNumber());
-
-  std::vector<MediaTrack::Id> track_ids;
-
-  // Disable audio track.
-  pipeline_->OnEnabledAudioTracksChanged(track_ids);
-  ASSERT_TRUE(Resume(TimestampMs(100)));
-  ASSERT_TRUE(WaitUntilCurrentTimeIsAfter(TimestampMs(200)));
-  ASSERT_TRUE(Suspend());
-
-  // Re-enable audio track.
-  track_ids.push_back("2");
-  pipeline_->OnEnabledAudioTracksChanged(track_ids);
-  ASSERT_TRUE(Resume(TimestampMs(200)));
-  ASSERT_TRUE(WaitUntilCurrentTimeIsAfter(TimestampMs(300)));
-  ASSERT_TRUE(Suspend());
-
-  // Disable video track.
-  track_ids.clear();
-  pipeline_->OnSelectedVideoTrackChanged(track_ids);
-  ASSERT_TRUE(Resume(TimestampMs(300)));
-  ASSERT_TRUE(WaitUntilCurrentTimeIsAfter(TimestampMs(400)));
-  ASSERT_TRUE(Suspend());
-
-  // Re-enable video track.
-  track_ids.push_back("1");
-  pipeline_->OnSelectedVideoTrackChanged(track_ids);
-  ASSERT_TRUE(Resume(TimestampMs(400)));
-  ASSERT_TRUE(WaitUntilOnEnded());
-}
-
 TEST_F(PipelineIntegrationTest,
        MAYBE_CLOCKLESS(BasicPlaybackOpusOggTrimmingHashed)) {
   ASSERT_EQ(PIPELINE_OK,