summaryrefslogtreecommitdiffstats
path: root/content/renderer/media/capture_video_decoder_unittest.cc
diff options
context:
space:
mode:
authorfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-29 22:36:38 +0000
committerfischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-29 22:36:38 +0000
commitadabb62712f972e63fb19afc727093b2008d82ad (patch)
treeb384d924ec7531cc9efb7432d290a8b0ab593845 /content/renderer/media/capture_video_decoder_unittest.cc
parent4a338b43f6ecc9e030c9cd177e90f3308ea7fdd4 (diff)
downloadchromium_src-adabb62712f972e63fb19afc727093b2008d82ad.zip
chromium_src-adabb62712f972e63fb19afc727093b2008d82ad.tar.gz
chromium_src-adabb62712f972e63fb19afc727093b2008d82ad.tar.bz2
Convert all of media/ over to the new base::{Bind,Callback} hotness.
Mostly this was a rote conversion, replacing: - Pass-by-pointer CallbackN<>'s become pass-by-const-ref Callback<>'s. - scoped_ptr<CallbackN<>> members become Callback<> members. - several dedicated FooCallback typedefs became base::Closure. Because it was only used in a small handful of places and only in one place profitably, I deleted AutoCallbackRunner. Because it tickles a Bind bug I disabled mfdecoder in .gyp (about to get deleted in a scherkus CL). BUG=none TEST=media_tests, trybots Review URL: http://codereview.chromium.org/8071007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103376 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/media/capture_video_decoder_unittest.cc')
-rw-r--r--content/renderer/media/capture_video_decoder_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/content/renderer/media/capture_video_decoder_unittest.cc b/content/renderer/media/capture_video_decoder_unittest.cc
index 8e7be2a..a74c305 100644
--- a/content/renderer/media/capture_video_decoder_unittest.cc
+++ b/content/renderer/media/capture_video_decoder_unittest.cc
@@ -114,9 +114,9 @@ class CaptureVideoDecoderTest : public ::testing::Test {
message_loop_->RunAllPending();
}
- media::StatisticsCallback* NewStatisticsCallback() {
- return NewCallback(&statistics_callback_object_,
- &media::MockStatisticsCallback::OnStatistics);
+ media::StatisticsCallback NewStatisticsCallback() {
+ return base::Bind(&media::MockStatisticsCallback::OnStatistics,
+ base::Unretained(&statistics_callback_object_));
}
// Fixture members.