| Index: media/filters/pipeline_integration_test_base.h
|
| diff --git a/media/filters/pipeline_integration_test_base.h b/media/filters/pipeline_integration_test_base.h
|
| index 10cf2620a86845b1833b81857b1899881a807a55..7eee88c3bc6ecb825da9e8d7e58a63f064c7b012 100644
|
| --- a/media/filters/pipeline_integration_test_base.h
|
| +++ b/media/filters/pipeline_integration_test_base.h
|
| @@ -32,17 +32,6 @@ extern const char kNullVideoHash[];
|
| // Empty hash string. Used to verify empty audio tracks.
|
| extern const char kNullAudioHash[];
|
|
|
| -// Dummy tick clock which advances extremely quickly (1 minute every time
|
| -// NowTicks() is called).
|
| -class DummyTickClock : public base::TickClock {
|
| - public:
|
| - DummyTickClock() : now_() {}
|
| - virtual ~DummyTickClock() {}
|
| - virtual base::TimeTicks NowTicks() OVERRIDE;
|
| - private:
|
| - base::TimeTicks now_;
|
| -};
|
| -
|
| // Integration tests for Pipeline. Real demuxers, real decoders, and
|
| // base renderer implementations are used to verify pipeline functionality. The
|
| // renderers used in these tests rely heavily on the AudioRendererBase &
|
| @@ -109,7 +98,6 @@ class PipelineIntegrationTestBase {
|
| PipelineStatus pipeline_status_;
|
| Demuxer::NeedKeyCB need_key_cb_;
|
| VideoFrame::Format last_video_frame_format_;
|
| - DummyTickClock dummy_clock_;
|
| AudioHardwareConfig hardware_config_;
|
| PipelineMetadata metadata_;
|
|
|
|
|