Merge FilterStatusCB into PipelineStatusCB.

media/base/mock_filters.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/mock_filters.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/filter_host.h"
 
@@ skipping 139 matching lines @@
     EXPECT_CALL(*demuxer_factory, Build(_, _));
 
   collection->SetDemuxerFactory(demuxer_factory.PassAs<DemuxerFactory>());
   collection->AddVideoDecoder(video_decoder_);
   collection->AddAudioDecoder(audio_decoder_);
   collection->AddVideoRenderer(video_renderer_);
   collection->AddAudioRenderer(audio_renderer_);
   return collection.Pass();
 }
 
-void RunFilterCallback(::testing::Unused, const base::Closure& callback) {
-  callback.Run();
-
+void RunFilterCallback(::testing::Unused, const base::Closure& closure) {
+  closure.Run();
 }
 
-void RunFilterStatusCB(::testing::Unused, const FilterStatusCB& cb) {
-  cb.Run(PIPELINE_OK);
-}
-
-void RunPipelineStatusCB(PipelineStatus status, const PipelineStatusCB& cb) {
-  cb.Run(status);
+void RunPipelineStatusCB(::testing::Unused, const PipelineStatusCB& status_cb) {
+  status_cb.Run(PIPELINE_OK);
 }
 
 void RunPipelineStatusCB3(::testing::Unused, const PipelineStatusCB& status_cb,
                           ::testing::Unused) {
   status_cb.Run(PIPELINE_OK);
 }
 
 void RunPipelineStatusCB4(::testing::Unused, const PipelineStatusCB& status_cb,
                           ::testing::Unused, ::testing::Unused) {
   status_cb.Run(PIPELINE_OK);
 }
 
-void RunStopFilterCallback(const base::Closure& callback) {
-  callback.Run();
+void RunStopFilterCallback(const base::Closure& closure) {
+  closure.Run();
 }
 
 MockFilter::MockFilter() {
 }
 
 MockFilter::~MockFilter() {}
 
 MockStatisticsCB::MockStatisticsCB() {}
 
 MockStatisticsCB::~MockStatisticsCB() {}
 
 }  // namespace media