Fix MediaSourcePlayer unittests and minor code cleanup.

media/base/android/media_decoder_job.h

 // Copyright 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_DECODER_JOB_H_
 #define MEDIA_BASE_ANDROID_MEDIA_DECODER_JOB_H_
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
@@ skipping 17 matching lines @@
   // Callback when a decoder job finishes its work. Args: whether decode
   // finished successfully, presentation time, audio output bytes.
   typedef base::Callback<void(MediaCodecStatus, const base::TimeDelta&,
                               size_t)> DecoderCallback;
 
   virtual ~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);
 
   // Called by MediaSourcePlayer to decode some data.
   // |callback| - Run when decode operation has completed.
   //
   // Returns true if the next decode was started and |callback| will be
   // called when the decode operation is complete.
   // Returns false if a config change is needed. |callback| is ignored
@@ skipping 32 matching lines @@
   // Returns true if the "time to render" needs to be computed for frames in
   // this decoder job.
   virtual bool ComputeTimeToRender() const = 0;
 
  private:
   // Causes this instance to be deleted on the thread it is bound to.
   void Release();
 
   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);
 
   // Posts a task to start decoding the next access unit in |received_data_|.
   void DecodeNextAccessUnit(
       const base::TimeTicks& start_time_ticks,
       const base::TimeDelta& start_presentation_timestamp);
 
   // Helper function to decoder data on |thread_|. |unit| contains all the data
@@ skipping 58 matching lines @@
   // Decode() has completed. This gets set when Release() gets called
   // while there is a decode in progress.
   bool destroy_pending_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(MediaDecoderJob);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_DECODER_JOB_H_