Merge FilterStatusCB into PipelineStatusCB.

media/base/composite_filter.cc

 // 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.
 
 #include "media/base/composite_filter.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 184 matching lines @@
 void CompositeFilter::SetPlaybackRate(float playback_rate) {
   DCHECK_EQ(message_loop_, MessageLoop::current());
   for (FilterVector::iterator iter = filters_.begin();
        iter != filters_.end();
        ++iter) {
     (*iter)->SetPlaybackRate(playback_rate);
   }
 }
 
 void CompositeFilter::Seek(base::TimeDelta time,
-                           const FilterStatusCB& seek_cb) {
+                           const PipelineStatusCB& seek_cb) {
   DCHECK_EQ(message_loop_, MessageLoop::current());
 
   if (IsOperationPending()) {
     seek_cb.Run(PIPELINE_ERROR_OPERATION_PENDING);
     return;
   } else if (!host() || (state_ != kPaused && state_ != kCreated)) {
     seek_cb.Run(PIPELINE_ERROR_INVALID_STATE);
     return;
   }
 
@@ skipping 276 matching lines @@
 
 void CompositeFilter::FilterHostImpl::NotifyEnded() {
   host_->NotifyEnded();
 }
 
 void CompositeFilter::FilterHostImpl::DisableAudioRenderer() {
   host_->DisableAudioRenderer();
 }
 
 }  // namespace media