Merge FilterStatusCB into PipelineStatusCB.

media/base/mock_filters.cc

Index: media/base/mock_filters.cc
diff --git a/media/base/mock_filters.cc b/media/base/mock_filters.cc
index 08d663a1236fd999be956cba2afa35cc919a7237..03ae4c2a006a6442695209039448e593455d0844 100644
--- a/media/base/mock_filters.cc
+++ b/media/base/mock_filters.cc
@@ -157,17 +157,12 @@ scoped_ptr<FilterCollection> MockFilterCollection::filter_collection(
   return collection.Pass();
 }
 
-void RunFilterCallback(::testing::Unused, const base::Closure& callback) {
-  callback.Run();
-
-}
-
-void RunFilterStatusCB(::testing::Unused, const FilterStatusCB& cb) {
-  cb.Run(PIPELINE_OK);
+void RunFilterCallback(::testing::Unused, const base::Closure& closure) {
+  closure.Run();
 }
 
-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,
@@ -180,8 +175,8 @@ void RunPipelineStatusCB4(::testing::Unused, const PipelineStatusCB& status_cb,
   status_cb.Run(PIPELINE_OK);
 }
 
-void RunStopFilterCallback(const base::Closure& callback) {
-  callback.Run();
+void RunStopFilterCallback(const base::Closure& closure) {
+  closure.Run();
 }
 
 MockFilter::MockFilter() {