Fix the flaky MediaSourcePlayerTest

media/base/android/media_decoder_job.cc

Index: media/base/android/media_decoder_job.cc
diff --git a/media/base/android/media_decoder_job.cc b/media/base/android/media_decoder_job.cc
index b7eef0cdfbfbdb0769aaab6b621fda43f2948108..8a7b13ad4795a7c7ab1906ad10127568d5fdd71f 100644
--- a/media/base/android/media_decoder_job.cc
+++ b/media/base/android/media_decoder_job.cc
@@ -72,13 +72,18 @@ void MediaDecoderJob::OnDataReceived(const DemuxerData& data) {
   is_requesting_demuxer_data_ = false;
 
   base::Closure done_cb = base::ResetAndReturn(&on_data_received_cb_);
+
+  // If this data request is for the inactive chunk, do nothing.

[wolenetz, 2014/04/10 00:15:35]

I'm confused. If it's a request for the inactive chunk, on_data_received_cb_
should be just a base::Closure. However, if this data ack was received after
StopDecode() or ClearData(), then done_cb would be null here. Is it just the new
comment that is incorrect here?

[qinmin, 2014/04/10 00:19:37]

So if done_cb.is_null() is true, this is the data request for the inactive
chunk. And in this case, we should do nothing, just early return.

On 2014/04/10 00:15:35, wolenetz wrote:

+  if (done_cb.is_null())
+    return;
+
   if (stop_decode_pending_) {
+    DCHECK(is_decoding());
     OnDecodeCompleted(MEDIA_CODEC_STOPPED, kNoTimestamp(), 0);
     return;
   }
 
-  if (!done_cb.is_null())
-    done_cb.Run();
+  done_cb.Run();
 }
 
 void MediaDecoderJob::Prefetch(const base::Closure& prefetch_cb) {