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

media/base/test_helpers.h

 // 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.
 
 #ifndef MEDIA_BASE_TEST_HELPERS_H_
 #define MEDIA_BASE_TEST_HELPERS_H_
 
 #include <stddef.h>
 #include <memory>
 
 #include "base/callback.h"
 #include "base/macros.h"
+#include "base/memory/ref_counted.h"
+#include "base/threading/non_thread_safe.h"
 #include "media/base/audio_parameters.h"
 #include "media/base/channel_layout.h"
 #include "media/base/media_log.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/sample_format.h"
 #include "media/base/video_decoder_config.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace base {
-class MessageLoop;
 class RunLoop;
 class TimeDelta;
 }
 
 namespace media {
 
 class AudioBuffer;
 class DecoderBuffer;
 
 // Return a callback that expects to be run once.
 base::Closure NewExpectedClosure();
 base::Callback<void(bool)> NewExpectedBoolCB(bool success);
 PipelineStatusCB NewExpectedStatusCB(PipelineStatus status);
 
 // Helper class for running a message loop until a callback has run. Useful for
 // testing classes that run on more than a single thread.
 //
 // Events are intended for single use and cannot be reset.
-class WaitableMessageLoopEvent {
+class WaitableMessageLoopEvent : public base::NonThreadSafe {
  public:
   WaitableMessageLoopEvent();
   explicit WaitableMessageLoopEvent(base::TimeDelta timeout);
   ~WaitableMessageLoopEvent();
 
   // Returns a thread-safe closure that will signal |this| when executed.
   base::Closure GetClosure();
   PipelineStatusCB GetPipelineStatusCB();
 
   // Runs the current message loop until |this| has been signaled.
   //
   // Fails the test if the timeout is reached.
   void RunAndWait();
 
   // Runs the current message loop until |this| has been signaled and asserts
   // that the |expected| status was received.
   //
   // Fails the test if the timeout is reached.
   void RunAndWaitForStatus(PipelineStatus expected);
 
   bool is_signaled() const { return signaled_; }
 
  private:
   void OnCallback(PipelineStatus status);
   void OnTimeout();
 
-  base::MessageLoop* message_loop_;
   bool signaled_;
   PipelineStatus status_;
   std::unique_ptr<base::RunLoop> run_loop_;
   const base::TimeDelta timeout_;
 
   DISALLOW_COPY_AND_ASSIGN(WaitableMessageLoopEvent);
 };
 
 // Provides pre-canned VideoDecoderConfig. These types are used for tests that
 // don't care about detailed parameters of the config.
@@ skipping 62 matching lines @@
     base::TimeDelta timestamp,
     base::TimeDelta duration);
 
 // Verify if a fake video DecoderBuffer is valid.
 bool VerifyFakeVideoBufferForTest(const scoped_refptr<DecoderBuffer>& buffer,
                                   const VideoDecoderConfig& config);
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_TEST_HELPERS_H_