Fold media::PipelineImpl into media::Pipeline as there is only one implementation of the interface.

Three years ago I thought that having a separate interface would be A Good Thing. Needless to say there has never been a case where having an interface defintion of Pipeline came in handy as all clients create and access PipelineImpl objects directly.

Review URL: http://codereview.chromium.org/9243025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118082 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 13 insertions, 13 deletions

diff --git a/media/tools/player_wtl/movie.cc b/media/tools/player_wtl/movie.cc
index 44b20b2..f97f88a 100644
--- a/media/tools/player_wtl/movie.cc
+++ b/media/tools/player_wtl/movie.cc
@@ -11,7 +11,7 @@
 #include "media/base/filter_collection.h"
 #include "media/base/media_log.h"
 #include "media/base/message_loop_factory_impl.h"
-#include "media/base/pipeline_impl.h"
+#include "media/base/pipeline.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
 #include "media/filters/ffmpeg_demuxer_factory.h"
 #include "media/filters/ffmpeg_video_decoder.h"
@@ -25,7 +25,7 @@ using media::FFmpegDemuxerFactory;
 using media::FFmpegVideoDecoder;
 using media::FileDataSourceFactory;
 using media::FilterCollection;
-using media::PipelineImpl;
+using media::Pipeline;
 using media::ReferenceAudioRenderer;
 
 namespace media {
@@ -68,7 +68,7 @@ bool Movie::Open(const wchar_t* url, VideoRendererBase* video_renderer) {
 
   MessageLoop* pipeline_loop =
       message_loop_factory_->GetMessageLoop("PipelineThread");
-  pipeline_ = new PipelineImpl(pipeline_loop, new media::MediaLog());
+  pipeline_ = new Pipeline(pipeline_loop, new media::MediaLog());
 
   // Create filter collection.
   scoped_ptr<FilterCollection> collection(new FilterCollection());
diff --git a/media/tools/player_wtl/movie.h b/media/tools/player_wtl/movie.h
index 0b407bf..f6a3c44 100644
--- a/media/tools/player_wtl/movie.h
+++ b/media/tools/player_wtl/movie.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -18,7 +18,7 @@ template <typename T> struct DefaultSingletonTraits;
 
 namespace media {
 
-class PipelineImpl;
+class Pipeline;
 class VideoRendererBase;
 
 class Movie {
@@ -83,7 +83,7 @@ class Movie {
   Movie();
   virtual ~Movie();
 
-  scoped_refptr<PipelineImpl> pipeline_;
+  scoped_refptr<Pipeline> pipeline_;
   scoped_ptr<media::MessageLoopFactory> message_loop_factory_;
   scoped_refptr<AudioManager> audio_manager_;
 
diff --git a/media/tools/player_wtl/player_wtl.cc b/media/tools/player_wtl/player_wtl.cc
index 7ae160a..7756042 100644
--- a/media/tools/player_wtl/player_wtl.cc
+++ b/media/tools/player_wtl/player_wtl.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -8,7 +8,7 @@
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
-#include "media/base/pipeline_impl.h"
+#include "media/base/pipeline.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
 #include "media/filters/ffmpeg_demuxer.h"
 #include "media/filters/ffmpeg_video_decoder.h"
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc
index 11188db..f4b9fcc 100644
--- a/media/tools/player_x11/player_x11.cc
+++ b/media/tools/player_x11/player_x11.cc
@@ -21,7 +21,7 @@
 #include "media/base/media_log.h"
 #include "media/base/media_switches.h"
 #include "media/base/message_loop_factory_impl.h"
-#include "media/base/pipeline_impl.h"
+#include "media/base/pipeline.h"
 #include "media/base/video_frame.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
 #include "media/filters/ffmpeg_demuxer_factory.h"
@@ -100,7 +100,7 @@ bool InitPipeline(MessageLoop* message_loop,
                   const char* filename,
                   const PaintCB& paint_cb,
                   bool enable_audio,
-                  scoped_refptr<media::PipelineImpl>* pipeline,
+                  scoped_refptr<media::Pipeline>* pipeline,
                   MessageLoop* paint_message_loop,
                   media::MessageLoopFactory* message_loop_factory) {
   // Load media libraries.
@@ -135,7 +135,7 @@ bool InitPipeline(MessageLoop* message_loop,
   }
 
   // Create the pipeline and start it.
-  *pipeline = new media::PipelineImpl(message_loop, new media::MediaLog());
+  *pipeline = new media::Pipeline(message_loop, new media::MediaLog());
   media::PipelineStatusNotification note;
   (*pipeline)->Start(collection.Pass(), filename, note.Callback());
 
@@ -157,7 +157,7 @@ void TerminateHandler(int signal) {
 }
 
 void PeriodicalUpdate(
-    media::PipelineImpl* pipeline,
+    media::Pipeline* pipeline,
     MessageLoop* message_loop,
     bool audio_only) {
   if (!g_running) {
@@ -267,7 +267,7 @@ int main(int argc, char** argv) {
   scoped_ptr<media::MessageLoopFactory> message_loop_factory(
       new media::MessageLoopFactoryImpl());
   scoped_ptr<base::Thread> thread;
-  scoped_refptr<media::PipelineImpl> pipeline;
+  scoped_refptr<media::Pipeline> pipeline;
   MessageLoop message_loop;
   thread.reset(new base::Thread("PipelineThread"));
   thread->Start();