Merge FilterStatusCB into PipelineStatusCB.

media/filters/video_renderer_base.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.
 
 #ifndef MEDIA_FILTERS_VIDEO_RENDERER_BASE_H_
 #define MEDIA_FILTERS_VIDEO_RENDERER_BASE_H_
 
 #include <deque>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 31 matching lines @@
   VideoRendererBase(const base::Closure& paint_cb,
                     const SetOpaqueCB& set_opaque_cb);
   virtual ~VideoRendererBase();
 
   // Filter implementation.
   virtual void Play(const base::Closure& callback) OVERRIDE;
   virtual void Pause(const base::Closure& callback) OVERRIDE;
   virtual void Flush(const base::Closure& callback) OVERRIDE;
   virtual void Stop(const base::Closure& callback) OVERRIDE;
   virtual void SetPlaybackRate(float playback_rate) OVERRIDE;
-  virtual void Seek(base::TimeDelta time, const FilterStatusCB& cb) OVERRIDE;
+  virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) OVERRIDE;
 
   // VideoRenderer implementation.
   virtual void Initialize(VideoDecoder* decoder,
                           const PipelineStatusCB& status_cb,
                           const StatisticsCB& statistics_cb,
                           const TimeCB& time_cb) OVERRIDE;
   virtual bool HasEnded() OVERRIDE;
 
   // PlatformThread::Delegate implementation.
   virtual void ThreadMain() OVERRIDE;
@@ skipping 113 matching lines @@
   // Flushing cannot complete until both |pending_read_| and |pending_paint_|
   // are false.
   bool pending_read_;
   bool pending_paint_;
   bool pending_paint_with_last_available_;
 
   float playback_rate_;
 
   // Filter callbacks.
   base::Closure flush_cb_;
-  FilterStatusCB seek_cb_;
+  PipelineStatusCB seek_cb_;
   StatisticsCB statistics_cb_;
   TimeCB time_cb_;
 
   base::TimeDelta seek_timestamp_;
 
   VideoDecoder::ReadCB read_cb_;
 
   // Embedder callback for notifying a new frame is available for painting.
   base::Closure paint_cb_;
 
   // Callback to execute to inform the player if the video decoder's output is
   // opaque.
   SetOpaqueCB set_opaque_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoRendererBase);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_VIDEO_RENDERER_BASE_H_