Replace WaitableEvents and ConditionalVariables in VideoRendererBase tests with MessageLoop.

media/base/mock_callback.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/mock_callback.h"
 
 #include "base/bind.h"
+#include "base/message_loop.h"
 
 using ::testing::_;
 using ::testing::StrictMock;
 
 namespace media {
 
 MockClosure::MockClosure() {}
 MockClosure::~MockClosure() {}
 
 base::Closure NewExpectedClosure() {
   StrictMock<MockClosure>* callback = new StrictMock<MockClosure>();
   EXPECT_CALL(*callback, Run());
   return base::Bind(&MockClosure::Run, callback);
 }
 
 class MockStatusCB : public base::RefCountedThreadSafe<MockStatusCB> {
  public:
   MockStatusCB() {}
   MOCK_METHOD1(Run, void(PipelineStatus));
 
  protected:
   friend class base::RefCountedThreadSafe<MockStatusCB>;
   virtual ~MockStatusCB() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockStatusCB);
 };
 
-base::Callback<void(PipelineStatus)> NewExpectedStatusCB(
-    PipelineStatus status) {
+PipelineStatusCB NewExpectedStatusCB(PipelineStatus status) {
   StrictMock<MockStatusCB>* callback = new StrictMock<MockStatusCB>();
   EXPECT_CALL(*callback, Run(status));
   return base::Bind(&MockStatusCB::Run, callback);
 }
 
+static void RunStatusCBAndQuit(
+    const scoped_refptr<base::MessageLoopProxy> message_loop,
+    PipelineStatusCB status_cb,
+    PipelineStatus status) {
+  status_cb.Run(status);
+  message_loop->PostTask(FROM_HERE, MessageLoop::QuitWhenIdleClosure());
+}
+
+PipelineStatusCB NewExpectedStatusAndQuitCB(PipelineStatus status) {
+  StrictMock<MockStatusCB>* callback = new StrictMock<MockStatusCB>();
+  EXPECT_CALL(*callback, Run(status));
+  return base::Bind(&RunStatusCBAndQuit, base::MessageLoopProxy::current(),
+                    base::Bind(&MockStatusCB::Run, callback));
+}
+
 }  // namespace media