Index: media/base/test_helpers.h |
diff --git a/media/base/test_helpers.h b/media/base/test_helpers.h |
index c528b78387f80abdb6e7e395d0c40b2d83456626..2b17c566e689cda9030a6bf0e024745f1ef80bc5 100644 |
--- a/media/base/test_helpers.h |
+++ b/media/base/test_helpers.h |
@@ -10,6 +10,8 @@ |
#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" |
@@ -20,7 +22,6 @@ |
#include "ui/gfx/geometry/size.h" |
namespace base { |
-class MessageLoop; |
class RunLoop; |
class TimeDelta; |
} |
@@ -39,7 +40,7 @@ PipelineStatusCB NewExpectedStatusCB(PipelineStatus status); |
// 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); |
@@ -66,7 +67,6 @@ class WaitableMessageLoopEvent { |
void OnCallback(PipelineStatus status); |
void OnTimeout(); |
- base::MessageLoop* message_loop_; |
bool signaled_; |
PipelineStatus status_; |
std::unique_ptr<base::RunLoop> run_loop_; |