Follow-up cleanup promised during r103376's CR.

- mock_task.{h,cc} is gone.
- MockCallback is now MockClosure, and its commentary brought up to date (the
  commentary checked in was a mix of old and attempt-at-new that never
  materialized)
- NewExpectedCallback is NewExpectedClosure.

A bit of background on FooCallback vs. FooCB: when acolwell@ & I did the first
conversions to the new world, everything was named FooCallback.  I proposed
using FooCB for the migrated ones as a way to both easily visually differentiate
as well as save characters (!).  Now that we have an additional "don't typedef
Closures" guideline I like having FooCB for non-closure new-style callbacks, and
FooClosure for new-style closures.

BUG=none
TEST=trybots


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

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

3 files changed, 13 insertions, 15 deletions

diff --git a/content/renderer/media/audio_renderer_impl_unittest.cc b/content/renderer/media/audio_renderer_impl_unittest.cc
index 002cdaa..7810e6a0 100644
--- a/content/renderer/media/audio_renderer_impl_unittest.cc
+++ b/content/renderer/media/audio_renderer_impl_unittest.cc
@@ -164,7 +164,7 @@ class AudioRendererImplTest
     // Create and initialize the audio renderer.
     renderer_ = new TestAudioRendererImpl();
     renderer_->set_host(&host_);
-    renderer_->Initialize(decoder_, media::NewExpectedCallback());
+    renderer_->Initialize(decoder_, media::NewExpectedClosure());
 
     // Wraps delegate calls into tasks.
     delegate_caller_ = new DelegateCaller(renderer_);
@@ -228,7 +228,7 @@ TEST_F(AudioRendererImplTest, SetPlaybackRate) {
   renderer_->SetPlaybackRate(1.0f);
   renderer_->SetPlaybackRate(0.0f);
 
-  renderer_->Stop(media::NewExpectedCallback());
+  renderer_->Stop(media::NewExpectedClosure());
   WaitForIOThreadCompletion();
 }
 
@@ -238,14 +238,14 @@ TEST_F(AudioRendererImplTest, SetVolume) {
   // Tasks will be posted internally on the IO thread.
   renderer_->SetVolume(0.5f);
 
-  renderer_->Stop(media::NewExpectedCallback());
+  renderer_->Stop(media::NewExpectedClosure());
   WaitForIOThreadCompletion();
 }
 
 TEST_F(AudioRendererImplTest, Stop) {
   // Execute Stop() codepath.
   // Tasks will be posted internally on the IO thread.
-  renderer_->Stop(media::NewExpectedCallback());
+  renderer_->Stop(media::NewExpectedClosure());
 
   // Run AudioMessageFilter::Delegate methods, which can be executed after being
   // stopped. AudioRendererImpl shouldn't create any messages in this state.
@@ -299,7 +299,7 @@ TEST_F(AudioRendererImplTest, DestroyedMessageLoop_SetPlaybackRate) {
   renderer_->SetPlaybackRate(0.0f);
   renderer_->SetPlaybackRate(1.0f);
   renderer_->SetPlaybackRate(0.0f);
-  renderer_->Stop(media::NewExpectedCallback());
+  renderer_->Stop(media::NewExpectedClosure());
 }
 
 TEST_F(AudioRendererImplTest, DestroyedMessageLoop_SetVolume) {
@@ -314,7 +314,7 @@ TEST_F(AudioRendererImplTest, DestroyedMessageLoop_SetVolume) {
   // No tasks will be posted on the IO thread here since we are in
   // a "stopped" state.
   renderer_->SetVolume(0.5f);
-  renderer_->Stop(media::NewExpectedCallback());
+  renderer_->Stop(media::NewExpectedClosure());
 }
 
 TEST_F(AudioRendererImplTest, DestroyedMessageLoop_ConsumeAudioSamples) {
@@ -330,7 +330,7 @@ TEST_F(AudioRendererImplTest, DestroyedMessageLoop_ConsumeAudioSamples) {
   // a "stopped" state.
   scoped_refptr<media::Buffer> buffer(new media::DataBuffer(kSize));
   renderer_->ConsumeAudioSamples(buffer);
-  renderer_->Stop(media::NewExpectedCallback());
+  renderer_->Stop(media::NewExpectedClosure());
 }
 
 TEST_F(AudioRendererImplTest, UpdateEarliestEndTime) {
@@ -343,6 +343,6 @@ TEST_F(AudioRendererImplTest, UpdateEarliestEndTime) {
                                    time_now);
   int time_delta = (renderer_->earliest_end_time() - time_now).InMilliseconds();
   EXPECT_EQ(1100, time_delta);
-  renderer_->Stop(media::NewExpectedCallback());
+  renderer_->Stop(media::NewExpectedClosure());
   WaitForIOThreadCompletion();
 }
diff --git a/content/renderer/media/capture_video_decoder_unittest.cc b/content/renderer/media/capture_video_decoder_unittest.cc
index a74c305..780d803 100644
--- a/content/renderer/media/capture_video_decoder_unittest.cc
+++ b/content/renderer/media/capture_video_decoder_unittest.cc
@@ -11,7 +11,6 @@
 #include "media/base/mock_callback.h"
 #include "media/base/mock_filter_host.h"
 #include "media/base/mock_filters.h"
-#include "media/base/mock_task.h"
 #include "media/base/pipeline_status.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -144,7 +143,7 @@ TEST_F(CaptureVideoDecoderTest, Play) {
   EXPECT_CALL(*vc_manager_, AddDevice(_, _))
       .WillOnce(Return(vc_impl.get()));
   decoder_->Initialize(NULL,
-                       media::NewExpectedCallback(),
+                       media::NewExpectedClosure(),
                        NewStatisticsCallback());
   message_loop_->RunAllPending();
 
@@ -159,7 +158,7 @@ TEST_F(CaptureVideoDecoderTest, Play) {
       .WillRepeatedly(DeleteDataBuffer());
   decoder_->Seek(base::TimeDelta(),
                  media::NewExpectedStatusCB(media::PIPELINE_OK));
-  decoder_->Play(media::NewExpectedCallback());
+  decoder_->Play(media::NewExpectedClosure());
   message_loop_->RunAllPending();
 
   EXPECT_CALL(*vc_impl, StopCapture(capture_client))
@@ -167,6 +166,6 @@ TEST_F(CaptureVideoDecoderTest, Play) {
       .WillOnce(CaptureStopped(capture_client, vc_impl.get()));
   EXPECT_CALL(*vc_manager_, RemoveDevice(_, _))
       .WillOnce(Return());
-  decoder_->Stop(media::NewExpectedCallback());
+  decoder_->Stop(media::NewExpectedClosure());
   message_loop_->RunAllPending();
 }
diff --git a/content/renderer/media/rtc_video_decoder_unittest.cc b/content/renderer/media/rtc_video_decoder_unittest.cc
index 9e0968c..e75ad01 100644
--- a/content/renderer/media/rtc_video_decoder_unittest.cc
+++ b/content/renderer/media/rtc_video_decoder_unittest.cc
@@ -16,7 +16,6 @@
 #include "media/base/mock_callback.h"
 #include "media/base/mock_filter_host.h"
 #include "media/base/mock_filters.h"
-#include "media/base/mock_task.h"
 #include "media/base/video_frame.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/libjingle/source/talk/session/phone/videoframe.h"
@@ -35,7 +34,7 @@ using media::Limits;
 using media::MockStatisticsCallback;
 using media::MockVideoRenderer;
 using media::MockFilterHost;
-using media::NewExpectedCallback;
+using media::NewExpectedClosure;
 using media::PipelineStatistics;
 using media::PIPELINE_OK;
 using media::StatisticsCallback;
@@ -131,7 +130,7 @@ class RTCVideoDecoderTest : public testing::Test {
   void InitializeDecoderSuccessfully() {
     // Test successful initialization.
     decoder_->Initialize(NULL,
-                         NewExpectedCallback(), NewStatisticsCallback());
+                         NewExpectedClosure(), NewStatisticsCallback());
     message_loop_.RunAllPending();
   }