Fix MediaSourcePlayer unittests and minor code cleanup.

media/base/android/media_decoder_job.h

Index: media/base/android/media_decoder_job.h
diff --git a/media/base/android/media_decoder_job.h b/media/base/android/media_decoder_job.h
index e54080efa7771dd585bc8535667e1da21e240cba..d5a93b977c729c8cc1341c43daa68eba3cba3673 100644
--- a/media/base/android/media_decoder_job.h
+++ b/media/base/android/media_decoder_job.h
@@ -35,9 +35,6 @@ class MediaDecoderJob {
   // Called by MediaSourcePlayer when more data for this object has arrived.
   void OnDataReceived(const DemuxerData& data);
 
-  // Returns true if this object has data to decode.
-  bool HasData() const;
-
   // Prefetch so we know the decoder job has data when we call Decode().
   // |prefetch_cb| - Run when prefetching has completed.
   void Prefetch(const base::Closure& prefetch_cb);
@@ -90,6 +87,9 @@ class MediaDecoderJob {
 
   MediaCodecStatus QueueInputBuffer(const AccessUnit& unit);
 
+  // Returns true if this object has data to decode.
+  bool HasData() const;
+
   // Initiates a request for more data.
   // |done_cb| is called when more data is available in |received_data_|.
   void RequestData(const base::Closure& done_cb);