Revert of Fix an issue that audio and video may run out of sync

media/base/android/media_source_player_unittest.cc

 // Copyright 2013 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 <string>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
@@ skipping 2049 matching lines @@
   // player has not yet received media crypto.
   DemuxerConfigs configs = CreateVideoDemuxerConfigs();
   configs.is_video_encrypted = true;
 
   player_.OnDemuxerConfigsAvailable(configs);
   CreateNextTextureAndSetVideoSurface();
   EXPECT_FALSE(IsPendingSurfaceChange());
   EXPECT_FALSE(GetMediaDecoderJob(false));
 }
 
-TEST_F(MediaSourcePlayerTest, CurrentTimeUpdatedWhileDecoderStarved) {
-  SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE();
-
-  // Test that current time is updated while decoder is starved.
-  StartAudioDecoderJob(true);
-  for (int i = 0; i < 3; ++i) {
-    player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForAudio(i));
-    WaitForAudioDecodeDone();
-  }
-  base::TimeDelta current_time = player_.GetCurrentTime();
-
-  // Trigger starvation while the decoder is decoding.
-  player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForAudio(3));
-  TriggerPlayerStarvation();
-  WaitForAudioDecodeDone();
-
-  // Current time should be updated.
-  EXPECT_LT(current_time.InMillisecondsF(),
-            player_.GetCurrentTime().InMillisecondsF());
-}
-
-TEST_F(MediaSourcePlayerTest, CurrentTimeKeepsIncreasingAfterConfigChange) {
-  SKIP_TEST_IF_MEDIA_CODEC_BRIDGE_IS_NOT_AVAILABLE();
-
-  // Test current time keep on increasing after audio config change.
-  // Test that current time is updated while decoder is starved.
-  StartAudioDecoderJob(true);
-
-  for (int i = 0; i < 4; ++i) {
-    player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForAudio(i));
-    WaitForAudioDecodeDone();
-  }
-  base::TimeDelta current_time = player_.GetCurrentTime();
-  EXPECT_LT(0.0, current_time.InMillisecondsF());
-
-  DemuxerData data = CreateReadFromDemuxerAckWithConfigChanged(true, 0);
-  player_.OnDemuxerDataAvailable(data);
-  WaitForAudioDecodeDone();
-
-  // Simulate arrival of new configs.
-  player_.OnDemuxerConfigsAvailable(CreateAudioDemuxerConfigs(kCodecVorbis));
-  for (int i = 0; i < 4; ++i) {
-    player_.OnDemuxerDataAvailable(CreateReadFromDemuxerAckForAudio(i));
-    WaitForAudioDecodeDone();
-    base::TimeDelta new_current_time = player_.GetCurrentTime();
-    EXPECT_LE(current_time.InMillisecondsF(),
-              new_current_time.InMillisecondsF());
-    current_time = new_current_time;
-  }
-}
-
 }  // namespace media