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

2 files changed, 3 insertions, 3 deletions

diff --git a/webkit/glue/media/buffered_data_source_unittest.cc b/webkit/glue/media/buffered_data_source_unittest.cc
index cd6d005..4b10e79 100644
--- a/webkit/glue/media/buffered_data_source_unittest.cc
+++ b/webkit/glue/media/buffered_data_source_unittest.cc
@@ -220,7 +220,7 @@ class BufferedDataSourceTest : public testing::Test {
       EXPECT_CALL(*loader_, Stop());
     }
 
-    data_source_->Stop(media::NewExpectedCallback());
+    data_source_->Stop(media::NewExpectedClosure());
     message_loop_->RunAllPending();
   }
 
@@ -571,7 +571,7 @@ TEST_F(BufferedDataSourceTest, AbortDuringPendingRead) {
                  base::Unretained(static_cast<BufferedDataSourceTest*>(this))));
 
   // Stop() the data source like normal.
-  data_source_->Stop(media::NewExpectedCallback());
+  data_source_->Stop(media::NewExpectedClosure());
 
   // Allow cleanup task to run.
   message_loop_->RunAllPending();
diff --git a/webkit/glue/media/simple_data_source_unittest.cc b/webkit/glue/media/simple_data_source_unittest.cc
index 813f2f0..cfb5445 100644
--- a/webkit/glue/media/simple_data_source_unittest.cc
+++ b/webkit/glue/media/simple_data_source_unittest.cc
@@ -128,7 +128,7 @@ class SimpleDataSourceTest : public testing::Test {
   }
 
   void DestroyDataSource() {
-    data_source_->Stop(media::NewExpectedCallback());
+    data_source_->Stop(media::NewExpectedClosure());
     MessageLoop::current()->RunAllPending();
 
     data_source_ = NULL;