diff options
author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-30 15:09:52 +0000 |
---|---|---|
committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-30 15:09:52 +0000 |
commit | 08a77cd3d169e297cf1c13670821600867aa5043 (patch) | |
tree | 59ff22fe83ebb2460c4d1e20460823fae1c45963 /media/base/mock_callback.cc | |
parent | 95a33ed6cb8688573249f7cd7032d23518879c6d (diff) | |
download | chromium_src-08a77cd3d169e297cf1c13670821600867aa5043.zip chromium_src-08a77cd3d169e297cf1c13670821600867aa5043.tar.gz chromium_src-08a77cd3d169e297cf1c13670821600867aa5043.tar.bz2 |
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
Diffstat (limited to 'media/base/mock_callback.cc')
-rw-r--r-- | media/base/mock_callback.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/base/mock_callback.cc b/media/base/mock_callback.cc index fe991f8..58cc98e 100644 --- a/media/base/mock_callback.cc +++ b/media/base/mock_callback.cc @@ -11,13 +11,13 @@ using ::testing::StrictMock; namespace media { -MockCallback::MockCallback() {} -MockCallback::~MockCallback() {} +MockClosure::MockClosure() {} +MockClosure::~MockClosure() {} -base::Closure NewExpectedCallback() { - StrictMock<MockCallback>* callback = new StrictMock<MockCallback>(); +base::Closure NewExpectedClosure() { + StrictMock<MockClosure>* callback = new StrictMock<MockClosure>(); EXPECT_CALL(*callback, Run()); - return base::Bind(&MockCallback::Run, callback); + return base::Bind(&MockClosure::Run, callback); } class MockStatusCB : public base::RefCountedThreadSafe<MockStatusCB> { |