Fix media timeline so that thumb never exceeds buffered data

media/base/mock_filters.h

 // Copyright (c) 2012 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.
 //
 // A new breed of mock media filters, this time using gmock!  Feel free to add
 // actions if you need interesting side-effects (i.e., copying data to the
 // buffer passed into MockDataSource::Read()).
 //
 // Don't forget you can use StrictMock<> and NiceMock<> if you want the mock
 // filters to fail the test or do nothing when an unexpected method is called.
@@ skipping 219 matching lines @@
  public:
   MockVideoRenderer();
 
   // Filter implementation.
   MOCK_METHOD1(Stop, void(const base::Closure& callback));
   MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));
   MOCK_METHOD2(Seek, void(base::TimeDelta time, const FilterStatusCB& cb));
   MOCK_METHOD0(OnAudioRendererDisabled, void());
 
   // VideoRenderer implementation.
-  MOCK_METHOD3(Initialize, void(VideoDecoder* decoder,
-                                const base::Closure& callback,
-                                const StatisticsCallback& stats_callback));
+  MOCK_METHOD4(Initialize, void(VideoDecoder* decoder,
+                                const base::Closure& init_callback,
+                                const StatisticsCallback& stats_callback,
+                                const VideoTimeCB& time_cb));
+
   MOCK_METHOD0(HasEnded, bool());
 
   // TODO(scherkus): although VideoRendererBase defines this method, this really
   // shouldn't be here OR should be renamed.
   MOCK_METHOD1(ConsumeVideoFrame, void(scoped_refptr<VideoFrame> frame));
 
  protected:
   virtual ~MockVideoRenderer();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockVideoRenderer);
 };
 
 class MockAudioRenderer : public AudioRenderer {
  public:
   MockAudioRenderer();
 
   // Filter implementation.
   MOCK_METHOD1(Stop, void(const base::Closure& callback));
   MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));
   MOCK_METHOD2(Seek, void(base::TimeDelta time, const FilterStatusCB& cb));
   MOCK_METHOD0(OnAudioRendererDisabled, void());
 
   // AudioRenderer implementation.
-  MOCK_METHOD3(Initialize, void(AudioDecoder* decoder,
+  MOCK_METHOD4(Initialize, void(AudioDecoder* decoder,
                                 const base::Closure& init_callback,
-                                const base::Closure& underflow_callback));
+                                const base::Closure& underflow_callback,
+                                const AudioTimeCB& time_cb));
   MOCK_METHOD0(HasEnded, bool());
   MOCK_METHOD1(SetVolume, void(float volume));
 
   MOCK_METHOD1(ResumeAfterUnderflow, void(bool buffer_more_audio));
 
  protected:
   virtual ~MockAudioRenderer();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockAudioRenderer);
@@ skipping 32 matching lines @@
 };
 
 // Helper gmock functions that immediately executes and destroys the
 // Closure on behalf of the provided filter.  Can be used when mocking
 // the Initialize() and Seek() methods.
 void RunFilterCallback(::testing::Unused, const base::Closure& callback);
 void RunFilterStatusCB(::testing::Unused, const FilterStatusCB& cb);
 void RunPipelineStatusCB(PipelineStatus status, const PipelineStatusCB& cb);
 void RunFilterCallback3(::testing::Unused, const base::Closure& callback,
                         ::testing::Unused);
+void RunFilterCallback4(::testing::Unused, const base::Closure& callback,
+                        ::testing::Unused, ::testing::Unused);
 
 // Helper gmock function that immediately executes the Closure on behalf of the
 // provided filter.  Can be used when mocking the Stop() method.
 void RunStopFilterCallback(const base::Closure& callback);
 
 // Helper gmock action that calls SetError() on behalf of the provided filter.
 ACTION_P2(SetError, filter, error) {
   filter->host()->SetError(error);
 }
 
@@ skipping 14 matching lines @@
  public:
   MockStatisticsCallback();
   ~MockStatisticsCallback();
 
   MOCK_METHOD1(OnStatistics, void(const media::PipelineStatistics& statistics));
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_MOCK_FILTERS_H_