PipelineError is dead. Long live PipelineStatus!

media/filters/ffmpeg_demuxer_factory.cc

 // Copyright (c) 2011 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.
 
 #include "base/message_loop.h"
 #include "media/filters/ffmpeg_demuxer.h"
 #include "media/filters/ffmpeg_demuxer_factory.h"
 
 namespace media {
 
@@ skipping 13 matching lines @@
  public:
   DemuxerCallbackAsPipelineStatusCallback(
       DemuxerFactory::BuildCallback* cb,
       Demuxer* demuxer)
       : cb_(cb), demuxer_(demuxer) {
     DCHECK(cb_.get() && demuxer_);
   }
 
   virtual ~DemuxerCallbackAsPipelineStatusCallback() {}
 
-  virtual void RunWithParams(const Tuple1<PipelineError>& params) {
+  virtual void RunWithParams(const Tuple1<PipelineStatus>& params) {
     cb_->Run(params.a, demuxer_);
   }
 
  private:
   scoped_ptr<DemuxerFactory::BuildCallback> cb_;
   scoped_refptr<Demuxer> demuxer_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(DemuxerCallbackAsPipelineStatusCallback);
 };
 
 // See comments on DemuxerCallbackAsPipelineStatusCallback above.
 class DemuxerCallbackAsDataSourceCallback :
     public DataSourceFactory::BuildCallback {
  public:
   DemuxerCallbackAsDataSourceCallback(DemuxerFactory::BuildCallback* cb,
                                       MessageLoop* loop)
       : cb_(cb), loop_(loop) {
     DCHECK(cb_.get() && loop_);
   }
 
   virtual ~DemuxerCallbackAsDataSourceCallback() {}
 
-  virtual void RunWithParams(const Tuple2<PipelineError, DataSource*>& params) {
-    PipelineError status = params.a;
+  virtual void RunWithParams(
+      const Tuple2<PipelineStatus, DataSource*>& params) {
+    PipelineStatus status = params.a;
     DataSource* data_source = params.b;
     if (status != PIPELINE_OK) {
       cb_->Run(status, static_cast<Demuxer*>(NULL));
       return;
     }
     DCHECK(data_source);
     scoped_refptr<FFmpegDemuxer> demuxer = new FFmpegDemuxer(loop_);
     demuxer->Initialize(
         data_source,
         new DemuxerCallbackAsPipelineStatusCallback(cb_.release(), demuxer));
   }
 
  private:
   scoped_ptr<DemuxerFactory::BuildCallback> cb_;
   MessageLoop* loop_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(DemuxerCallbackAsDataSourceCallback);
 };
 
 void FFmpegDemuxerFactory::Build(const std::string& url, BuildCallback* cb) {
   data_source_factory_->Build(
       url, new DemuxerCallbackAsDataSourceCallback(cb, loop_));
 }
 
 DemuxerFactory* FFmpegDemuxerFactory::Clone() const {
   return new FFmpegDemuxerFactory(data_source_factory_->Clone(), loop_);
 }
 
 }  // namespace media