| Index: media/video/capture/video_capture_device_unittest.cc
|
| diff --git a/media/video/capture/video_capture_device_unittest.cc b/media/video/capture/video_capture_device_unittest.cc
|
| index e0ef9259cf1440206449bc03580f2e859570d02a..961957f18c98f4a98b2030d1258fc21a43cbf8eb 100644
|
| --- a/media/video/capture/video_capture_device_unittest.cc
|
| +++ b/media/video/capture/video_capture_device_unittest.cc
|
| @@ -6,10 +6,9 @@
|
| #include "base/bind_helpers.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "base/message_loop/message_loop_proxy.h"
|
| #include "base/run_loop.h"
|
| -#include "base/single_thread_task_runner.h"
|
| #include "base/test/test_timeouts.h"
|
| -#include "base/thread_task_runner_handle.h"
|
| #include "base/threading/thread.h"
|
| #include "media/base/video_capture_types.h"
|
| #include "media/video/capture/video_capture_device.h"
|
| @@ -81,8 +80,7 @@
|
| MOCK_METHOD1(OnError, void(const std::string& reason));
|
|
|
| explicit MockClient(base::Callback<void(const VideoCaptureFormat&)> frame_cb)
|
| - : main_thread_(base::ThreadTaskRunnerHandle::Get()),
|
| - frame_cb_(frame_cb) {}
|
| + : main_thread_(base::MessageLoopProxy::current()), frame_cb_(frame_cb) {}
|
|
|
| void OnIncomingCapturedData(const uint8* data,
|
| int length,
|
| @@ -143,7 +141,7 @@
|
| new MockClient(base::Bind(&VideoCaptureDeviceTest::OnFrameCaptured,
|
| base::Unretained(this)))),
|
| video_capture_device_factory_(VideoCaptureDeviceFactory::CreateFactory(
|
| - base::ThreadTaskRunnerHandle::Get())) {
|
| + base::MessageLoopProxy::current())) {
|
| device_enumeration_listener_ = new DeviceEnumerationListener();
|
| }
|
|
|
|
|