Rename MediaFilter and MediaFilterCollection to Filter and FilterCollection, respectively.

media/base/pipeline.h

 // Copyright (c) 2010 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.
 
 // The pipeline is the public API clients use for playing back media.  Clients
 // provide a filter collection containing the filters they want the pipeline to
 // use to render media.
 
 #ifndef MEDIA_BASE_PIPELINE_H_
 #define MEDIA_BASE_PIPELINE_H_
 
 #include <string>
 
 #include "base/callback.h"
-#include "media/base/filters.h"
-#include "media/base/media_filter_collection.h"
 
 namespace base {
 class TimeDelta;
 }
 
 namespace media {
 
 // Error definitions for pipeline.  All codes indicate an error except:
 // PIPELINE_OK indicates the pipeline is running normally.
 enum PipelineError {
   PIPELINE_OK,
   PIPELINE_ERROR_URL_NOT_FOUND,
   PIPELINE_ERROR_NETWORK,
   PIPELINE_ERROR_DECODE,
   PIPELINE_ERROR_ABORT,
   PIPELINE_ERROR_INITIALIZATION_FAILED,
   PIPELINE_ERROR_REQUIRED_FILTER_MISSING,
   PIPELINE_ERROR_OUT_OF_MEMORY,
   PIPELINE_ERROR_COULD_NOT_RENDER,
   PIPELINE_ERROR_READ,
   PIPELINE_ERROR_AUDIO_HARDWARE,
   // Demuxer related errors.
   DEMUXER_ERROR_COULD_NOT_OPEN,
   DEMUXER_ERROR_COULD_NOT_PARSE,
   DEMUXER_ERROR_NO_SUPPORTED_STREAMS,
   DEMUXER_ERROR_COULD_NOT_CREATE_THREAD,
 };
 
+class FilterCollection;
+
 // Client-provided callbacks for various pipeline operations.  Clients should
 // inspect the Pipeline for errors.
 typedef Callback0::Type PipelineCallback;
 
 class Pipeline : public base::RefCountedThreadSafe<Pipeline> {
  public:
   // Initializes pipeline. Pipeline takes ownership of all callbacks passed
   // into this method.
   // |ended_callback| will be executed when the media reaches the end.
   // |error_callback_| will be executed upon an error in the pipeline.
   // |network_callback_| will be executed when there's a network event.
   virtual void Init(PipelineCallback* ended_callback,
                     PipelineCallback* error_callback,
                     PipelineCallback* network_callback) = 0;
 
   // Build a pipeline to render the given URL using the given filter collection
   // to construct a filter chain.  Returns true if successful, false otherwise
   // (i.e., pipeline already started).  Note that a return value of true
   // only indicates that the initialization process has started successfully.
   // Pipeline initialization is an inherently asynchronous process.  Clients can
   // either poll the IsInitialized() method (discouraged) or use the
   // |start_callback| as described below.
   //
   // This method is asynchronous and can execute a callback when completed.
   // If the caller provides a |start_callback|, it will be called when the
   // pipeline initialization completes.  Clients are expected to call GetError()
   // to check whether initialization succeeded.
-  virtual bool Start(MediaFilterCollection* filter_collection,
+  virtual bool Start(FilterCollection* filter_collection,
                      const std::string& url,
                      PipelineCallback* start_callback) = 0;
 
   // Asynchronously stops the pipeline and resets it to an uninitialized state.
   // If provided, |stop_callback| will be executed when the pipeline has been
   // completely torn down and reset to an uninitialized state.  It is acceptable
   // to call Start() again once the callback has finished executing.
   //
   // Stop() must be called before destroying the pipeline.  Clients can
   // determine whether Stop() must be called by checking IsRunning().
@@ skipping 89 matching lines @@
 
  protected:
   // Only allow ourselves to be deleted by reference counting.
   friend class base::RefCountedThreadSafe<Pipeline>;
   virtual ~Pipeline() {}
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_PIPELINE_H_