Merge from Chromium at DEPS revision 224184

This commit was generated by merge_to_master.py.

Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423

1 files changed, 5 insertions, 4 deletions

diff --git a/media/base/android/media_source_player.cc b/media/base/android/media_source_player.cc
index 835a7ae84b..fe79d75265 100644
--- a/media/base/android/media_source_player.cc
+++ b/media/base/android/media_source_player.cc
@@ -146,7 +146,7 @@ void MediaSourcePlayer::Start() {
   StartInternal();
 }
 
-void MediaSourcePlayer::Pause() {
+void MediaSourcePlayer::Pause(bool is_media_related_action) {
   DVLOG(1) << __FUNCTION__;
 
   // Since decoder jobs have their own thread, decoding is not fully paused
@@ -391,10 +391,11 @@ void MediaSourcePlayer::ProcessPendingEvents() {
   }
 
   if (IsEventPending(SEEK_EVENT_PENDING)) {
-    DVLOG(1) << __FUNCTION__ << " : Handling SEEK_EVENT.";
+    int seek_request_id = ++seek_request_id_;
+    DVLOG(1) << __FUNCTION__ << " : Handling SEEK_EVENT: " << seek_request_id;
     ClearDecodingData();
     demuxer_->RequestDemuxerSeek(
-        demuxer_client_id_, GetCurrentTime(), ++seek_request_id_);
+        demuxer_client_id_, GetCurrentTime(), seek_request_id);
     return;
   }
 
@@ -730,7 +731,7 @@ void MediaSourcePlayer::SetPendingEvent(PendingEventFlags event) {
 void MediaSourcePlayer::ClearPendingEvent(PendingEventFlags event) {
   DVLOG(1) << __FUNCTION__ << "(" << GetEventName(event) << ")";
   DCHECK_NE(event, NO_EVENT_PENDING);
-  DCHECK(IsEventPending(event));
+  DCHECK(IsEventPending(event)) << GetEventName(event);
 
   pending_event_ &= ~event;
 }