Fix MediaSourcePlayer unittests and minor code cleanup.

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 99 matching lines @@
   bool HasVideo();
   bool HasAudio();
 
   // Determine seekability based on duration.
   bool Seekable();
 
   // Called when the |decoder_starvation_callback_| times out.
   void OnDecoderStarved();
 
   // Starts the |decoder_starvation_callback_| task with the timeout value.
-  void StartStarvationCallback(const base::TimeDelta& timeout);
+  // |presentation_timestamp| - The presentation timestamp used for starvation
+  // timeout computations. It represents the timestamp of the last piece of
+  // decoded data.
+  void StartStarvationCallback(const base::TimeDelta& presentation_timestamp);
 
   // Schedules a seek event in |pending_events_| and calls StopDecode() on all
   // the MediaDecoderJobs.
   void ScheduleSeekEventAndStopDecoding();
 
   // Helper function to set the volume.
   void SetVolumeInternal();
 
   // Helper function to determine whether a protected surface is needed for
   // video playback.
@@ skipping 80 matching lines @@
 
   MediaDrmBridge* drm_bridge_;
 
   friend class MediaSourcePlayerTest;
   DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_SOURCE_PLAYER_H_