Abort MSP::OnPrefetchDone() if just after MSP::Release(). Let seek and config change survive.

media/base/android/media_source_player.h

 // Copyright (c) 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.
 
 #ifndef MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
 #define MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_
 
 #include <jni.h>
 #include <map>
 #include <string>
@@ skipping 136 matching lines @@
   // Helper function to determine whether a protected surface is needed for
   // video playback.
   bool IsProtectedSurfaceRequired();
 
   // Called when a MediaDecoderJob finishes prefetching data. Once all
   // MediaDecoderJobs have prefetched data, then this method updates
   // |start_time_ticks_| and |start_presentation_timestamp_| so that video can
   // resync with audio and starts decoding.
   void OnPrefetchDone();
 
+  // Test-only method to setup hook for the completion of the next decode cycle.
+  // This callback state is cleared when it is next run.
+  // Prevent usage creep by only calling this from the
+  // ReleaseWithOnPrefetchDoneAlreadyPosted MediaSourcePlayerTest.
+  void set_decode_callback_for_testing(const base::Closure& test_decode_cb) {
+    decode_callback_for_testing_ = test_decode_cb;
+  }
+
+  // TODO(qinmin/wolenetz): Reorder these based on their priority from
+  // ProcessPendingEvents(). Release() and other routines are dependent upon
+  // priority consistency.
   enum PendingEventFlags {
     NO_EVENT_PENDING = 0,
     SEEK_EVENT_PENDING = 1 << 0,
     SURFACE_CHANGE_EVENT_PENDING = 1 << 1,
     CONFIG_CHANGE_EVENT_PENDING = 1 << 2,
     PREFETCH_REQUEST_EVENT_PENDING = 1 << 3,
     PREFETCH_DONE_EVENT_PENDING = 1 << 4,
   };
 
   static const char* GetEventName(PendingEventFlags event);
@@ skipping 83 matching lines @@
   // Weak pointer passed to media decoder jobs for callbacks.
   base::WeakPtrFactory<MediaSourcePlayer> weak_this_;
 
   MediaDrmBridge* drm_bridge_;
 
   // No decryption key available to decrypt the encrypted buffer. In this case,
   // the player should pause. When a new key is added (OnKeyAdded()), we should
   // try to start playback again.
   bool is_waiting_for_key_;
 
+  // Test-only callback for hooking the completion of the next decode cycle.
+  base::Closure decode_callback_for_testing_;
+
   friend class MediaSourcePlayerTest;
   DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_