Callback renaming in media code.

This is a follow up CL of 125959.

- Rename AudioTimeCB and VideoTimeCB to TimeCB, as the context (VideoRenderer/AudioRenderer already provides clear context).
- Rename PipelineStatusCB callback variable names to status_cb if no names with specific meaning (e.g. seek_cb) are given.
- Rename foo_callback to foo_cb (except for media/audio/).

Note that media/audio also contains a lot of FooCallback types and foo_callback names. This will probably be addressed in another CL.

BUG=none
TEST=none


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

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

1 files changed, 6 insertions, 6 deletions

diff --git a/media/base/mock_filters.cc b/media/base/mock_filters.cc
index 74d80e6..08d663a 100644
--- a/media/base/mock_filters.cc
+++ b/media/base/mock_filters.cc
@@ -130,7 +130,7 @@ MockFilterCollection::~MockFilterCollection() {}
 
 scoped_ptr<FilterCollection> MockFilterCollection::filter_collection(
     bool include_demuxer,
-    bool run_build_callback,
+    bool run_build_cb,
     bool run_build,
     PipelineStatus build_status) const {
   scoped_ptr<FilterCollection> collection(new FilterCollection());
@@ -141,7 +141,7 @@ scoped_ptr<FilterCollection> MockFilterCollection::filter_collection(
   if (build_status != PIPELINE_OK)
     demuxer_factory->SetError(build_status);
 
-  if (run_build_callback) {
+  if (run_build_cb) {
     ON_CALL(*demuxer_factory, Build(_, _)).WillByDefault(Invoke(
         demuxer_factory.get(), &MockDemuxerFactory::RunBuildCallback));
   }  // else ignore Build calls.
@@ -170,14 +170,14 @@ void RunPipelineStatusCB(PipelineStatus status, const PipelineStatusCB& cb) {
   cb.Run(status);
 }
 
-void RunPipelineStatusCB3(::testing::Unused, const PipelineStatusCB& callback,
+void RunPipelineStatusCB3(::testing::Unused, const PipelineStatusCB& status_cb,
                           ::testing::Unused) {
-  callback.Run(PIPELINE_OK);
+  status_cb.Run(PIPELINE_OK);
 }
 
-void RunPipelineStatusCB4(::testing::Unused, const PipelineStatusCB& callback,
+void RunPipelineStatusCB4(::testing::Unused, const PipelineStatusCB& status_cb,
                           ::testing::Unused, ::testing::Unused) {
-  callback.Run(PIPELINE_OK);
+  status_cb.Run(PIPELINE_OK);
 }
 
 void RunStopFilterCallback(const base::Closure& callback) {