Remove calls to MessageLoop::current() in media.

media/base/test_helpers.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/test_helpers.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/message_loop/message_loop.h"
 #include "base/pickle.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "media/base/audio_buffer.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/media_util.h"
 #include "ui/gfx/geometry/rect.h"
@@ skipping 37 matching lines @@
 PipelineStatusCB NewExpectedStatusCB(PipelineStatus status) {
   StrictMock<MockCallback>* callback = new StrictMock<MockCallback>();
   EXPECT_CALL(*callback, RunWithStatus(status));
   return base::Bind(&MockCallback::RunWithStatus, callback);
 }
 
 WaitableMessageLoopEvent::WaitableMessageLoopEvent()
     : WaitableMessageLoopEvent(TestTimeouts::action_timeout()) {}
 
 WaitableMessageLoopEvent::WaitableMessageLoopEvent(base::TimeDelta timeout)
-    : message_loop_(base::MessageLoop::current()),
-      signaled_(false),
-      status_(PIPELINE_OK),
-      timeout_(timeout) {
-  DCHECK(message_loop_);
+    : signaled_(false), status_(PIPELINE_OK), timeout_(timeout) {
+  DCHECK(CalledOnValidThread());

[chcunningham, 2016/06/29 18:10:04]

This is sort of tautological right? Thread checker was just constructed on this
thread, so its definitely going to be valid.

[fdoray, 2016/06/29 18:20:17]

Done. Removed it, you're right.

 }
 
-WaitableMessageLoopEvent::~WaitableMessageLoopEvent() {}
+WaitableMessageLoopEvent::~WaitableMessageLoopEvent() {
+  DCHECK(CalledOnValidThread());
+}
 
 base::Closure WaitableMessageLoopEvent::GetClosure() {
-  DCHECK_EQ(message_loop_, base::MessageLoop::current());
+  DCHECK(CalledOnValidThread());
   return BindToCurrentLoop(base::Bind(
       &WaitableMessageLoopEvent::OnCallback, base::Unretained(this),
       PIPELINE_OK));
 }
 
 PipelineStatusCB WaitableMessageLoopEvent::GetPipelineStatusCB() {
-  DCHECK_EQ(message_loop_, base::MessageLoop::current());
+  DCHECK(CalledOnValidThread());
   return BindToCurrentLoop(base::Bind(
       &WaitableMessageLoopEvent::OnCallback, base::Unretained(this)));
 }
 
 void WaitableMessageLoopEvent::RunAndWait() {
+  DCHECK(CalledOnValidThread());
   RunAndWaitForStatus(PIPELINE_OK);
 }
 
 void WaitableMessageLoopEvent::RunAndWaitForStatus(PipelineStatus expected) {
-  DCHECK_EQ(message_loop_, base::MessageLoop::current());
+  DCHECK(CalledOnValidThread());
   if (signaled_) {
     EXPECT_EQ(expected, status_);
     return;
   }
 
   run_loop_.reset(new base::RunLoop());
   base::Timer timer(false, false);
   timer.Start(
       FROM_HERE, timeout_,
       base::Bind(&WaitableMessageLoopEvent::OnTimeout, base::Unretained(this)));
 
   run_loop_->Run();
   EXPECT_TRUE(signaled_);
   EXPECT_EQ(expected, status_);
   run_loop_.reset();
 }
 
 void WaitableMessageLoopEvent::OnCallback(PipelineStatus status) {
-  DCHECK_EQ(message_loop_, base::MessageLoop::current());
+  DCHECK(CalledOnValidThread());
   signaled_ = true;
   status_ = status;
 
   // |run_loop_| may be null if the callback fires before RunAndWaitForStatus().
   if (run_loop_)
     run_loop_->Quit();
 }
 
 void WaitableMessageLoopEvent::OnTimeout() {
-  DCHECK_EQ(message_loop_, base::MessageLoop::current());
+  DCHECK(CalledOnValidThread());
   ADD_FAILURE() << "Timed out waiting for message loop to quit";
   run_loop_->Quit();
 }
 
 static VideoDecoderConfig GetTestConfig(VideoCodec codec,
                                         gfx::Size coded_size,
                                         bool is_encrypted) {
   gfx::Rect visible_rect(coded_size.width(), coded_size.height());
   gfx::Size natural_size = coded_size;
 
@@ skipping 138 matching lines @@
   int width = 0;
   int height = 0;
   bool success = pickle.ReadString(&header) && pickle.ReadInt(&width) &&
                  pickle.ReadInt(&height);
   return (success && header == kFakeVideoBufferHeader &&
           width == config.coded_size().width() &&
           height == config.coded_size().height());
 }
 
 }  // namespace media