Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(259)

Side by Side Diff: media/base/test_helpers.cc

Issue 66953005: Remove media::BindToLoop() in favour of media::BindToCurrentLoop(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nits Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/base/test_helpers.h" 5 #include "media/base/test_helpers.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/pickle.h" 10 #include "base/pickle.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 : message_loop_(base::MessageLoop::current()), 55 : message_loop_(base::MessageLoop::current()),
56 signaled_(false), 56 signaled_(false),
57 status_(PIPELINE_OK) { 57 status_(PIPELINE_OK) {
58 DCHECK(message_loop_); 58 DCHECK(message_loop_);
59 } 59 }
60 60
61 WaitableMessageLoopEvent::~WaitableMessageLoopEvent() {} 61 WaitableMessageLoopEvent::~WaitableMessageLoopEvent() {}
62 62
63 base::Closure WaitableMessageLoopEvent::GetClosure() { 63 base::Closure WaitableMessageLoopEvent::GetClosure() {
64 DCHECK_EQ(message_loop_, base::MessageLoop::current()); 64 DCHECK_EQ(message_loop_, base::MessageLoop::current());
65 return BindToLoop(message_loop_->message_loop_proxy(), base::Bind( 65 return BindToCurrentLoop(base::Bind(
66 &WaitableMessageLoopEvent::OnCallback, base::Unretained(this), 66 &WaitableMessageLoopEvent::OnCallback, base::Unretained(this),
67 PIPELINE_OK)); 67 PIPELINE_OK));
68 } 68 }
69 69
70 PipelineStatusCB WaitableMessageLoopEvent::GetPipelineStatusCB() { 70 PipelineStatusCB WaitableMessageLoopEvent::GetPipelineStatusCB() {
71 DCHECK_EQ(message_loop_, base::MessageLoop::current()); 71 DCHECK_EQ(message_loop_, base::MessageLoop::current());
72 return BindToLoop(message_loop_->message_loop_proxy(), base::Bind( 72 return BindToCurrentLoop(base::Bind(
73 &WaitableMessageLoopEvent::OnCallback, base::Unretained(this))); 73 &WaitableMessageLoopEvent::OnCallback, base::Unretained(this)));
74 } 74 }
75 75
76 void WaitableMessageLoopEvent::RunAndWait() { 76 void WaitableMessageLoopEvent::RunAndWait() {
77 RunAndWaitForStatus(PIPELINE_OK); 77 RunAndWaitForStatus(PIPELINE_OK);
78 } 78 }
79 79
80 void WaitableMessageLoopEvent::RunAndWaitForStatus(PipelineStatus expected) { 80 void WaitableMessageLoopEvent::RunAndWaitForStatus(PipelineStatus expected) {
81 DCHECK_EQ(message_loop_, base::MessageLoop::current()); 81 DCHECK_EQ(message_loop_, base::MessageLoop::current());
82 if (signaled_) { 82 if (signaled_) {
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 int width = 0; 274 int width = 0;
275 int height = 0; 275 int height = 0;
276 bool success = pickle.ReadString(&header) && pickle.ReadInt(&width) && 276 bool success = pickle.ReadString(&header) && pickle.ReadInt(&width) &&
277 pickle.ReadInt(&height); 277 pickle.ReadInt(&height);
278 return (success && header == kFakeVideoBufferHeader && 278 return (success && header == kFakeVideoBufferHeader &&
279 width == config.coded_size().width() && 279 width == config.coded_size().width() &&
280 height == config.coded_size().height()); 280 height == config.coded_size().height());
281 } 281 }
282 282
283 } // namespace media 283 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698