Pass in media message loop to VideoRendererBase and enforce calling on the right thread.

media/filters/video_renderer_base_unittest.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 "base/bind.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/stringprintf.h"
@@ skipping 22 matching lines @@
 static const int kFrameDurationInMs = 10;
 static const int kVideoDurationInMs = kFrameDurationInMs * 100;
 static const gfx::Size kNaturalSize(16u, 16u);
 
 class VideoRendererBaseTest : public ::testing::Test {
  public:
   VideoRendererBaseTest()
       : decoder_(new MockVideoDecoder()),
         demuxer_stream_(new MockDemuxerStream()) {
     renderer_ = new VideoRendererBase(
+        message_loop_.message_loop_proxy(),
         base::Bind(&VideoRendererBaseTest::OnPaint, base::Unretained(this)),
         base::Bind(&VideoRendererBaseTest::OnSetOpaque, base::Unretained(this)),
         true);
 
     EXPECT_CALL(*demuxer_stream_, type())
         .WillRepeatedly(Return(DemuxerStream::VIDEO));
 
     // We expect these to be called but we don't care how/when.
     EXPECT_CALL(*decoder_, Stop(_))
         .WillRepeatedly(RunClosure<0>());
@@ skipping 237 matching lines @@
   base::TimeDelta GetTime() {
     base::AutoLock l(lock_);
     return time_;
   }
 
   base::TimeDelta GetDuration() {
     return duration_;
   }
 
   void FrameRequested(const VideoDecoder::ReadCB& read_cb) {
-    // TODO(scherkus): Make VideoRendererBase call on right thread.
-    if (&message_loop_ != MessageLoop::current()) {
-      message_loop_.PostTask(FROM_HERE, base::Bind(
-          &VideoRendererBaseTest::FrameRequested, base::Unretained(this),
-          read_cb));
-      return;
-    }
-
+    DCHECK_EQ(&message_loop_, MessageLoop::current());
     CHECK(read_cb_.is_null());
     read_cb_ = read_cb;
 
     // Wake up WaitForPendingRead() if needed.
     if (!pending_read_cb_.is_null())
       base::ResetAndReturn(&pending_read_cb_).Run();
 
     if (decode_results_.empty())
       return;
 
     SatisfyPendingRead();
   }
 
   void FlushRequested(const base::Closure& callback) {
-    // TODO(scherkus): Make VideoRendererBase call on right thread.
-    if (&message_loop_ != MessageLoop::current()) {
-      message_loop_.PostTask(FROM_HERE, base::Bind(
-          &VideoRendererBaseTest::FlushRequested, base::Unretained(this),
-          callback));
-      return;
-    }
-
+    DCHECK_EQ(&message_loop_, MessageLoop::current());
     decode_results_.clear();
     if (!read_cb_.is_null()) {
       QueueAbortedRead();
       SatisfyPendingRead();
     }
 
     message_loop_.PostTask(FROM_HERE, callback);
   }
 
   MessageLoop message_loop_;
@@ skipping 278 matching lines @@
   InSequence s;
 
   EXPECT_CALL(*decoder_, Initialize(_, _, _))
       .WillOnce(RunCallback<1>(PIPELINE_ERROR_DECODE));
   InitializeRenderer(PIPELINE_ERROR_DECODE);
 
   Stop();
 }
 
 }  // namespace media