Merge FilterStatusCB into PipelineStatusCB.

media/filters/ffmpeg_video_decoder.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_FFMPEG_VIDEO_DECODER_H_
 #define MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
 
 #include <deque>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/filters.h"
 #include "media/crypto/aes_decryptor.h"
 #include "ui/gfx/size.h"
 
 class MessageLoop;
 
 struct AVCodecContext;
 struct AVFrame;
 
 namespace media {
 
 class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
  public:
   FFmpegVideoDecoder(const base::Callback<MessageLoop*()>& message_loop_cb);
   virtual ~FFmpegVideoDecoder();
 
   // Filter implementation.
   virtual void Stop(const base::Closure& callback) OVERRIDE;
-  virtual void Seek(base::TimeDelta time, const FilterStatusCB& cb) OVERRIDE;
+  virtual void Seek(base::TimeDelta time, const PipelineStatusCB& cb) OVERRIDE;
   virtual void Pause(const base::Closure& callback) OVERRIDE;
   virtual void Flush(const base::Closure& callback) OVERRIDE;
 
   // VideoDecoder implementation.
   virtual void Initialize(DemuxerStream* demuxer_stream,
                           const PipelineStatusCB& status_cb,
                           const StatisticsCB& statistics_cb) OVERRIDE;
   virtual void Read(const ReadCB& read_cb) OVERRIDE;
   virtual const gfx::Size& natural_size() OVERRIDE;
 
@@ skipping 59 matching lines @@
   scoped_refptr<DemuxerStream> demuxer_stream_;
 
   AesDecryptor decryptor_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_