| Index: media/video/capture/video_capture_proxy.cc
|
| diff --git a/media/video/capture/video_capture_proxy.cc b/media/video/capture/video_capture_proxy.cc
|
| index bbbd6108fcaa1cf9e5a20b553ffa07ee49e542f5..01cc003916e99f0f131b9f300a68d29f460842b6 100644
|
| --- a/media/video/capture/video_capture_proxy.cc
|
| +++ b/media/video/capture/video_capture_proxy.cc
|
| @@ -6,7 +6,7 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/location.h"
|
| -#include "base/message_loop/message_loop_proxy.h"
|
| +#include "base/single_thread_task_runner.h"
|
|
|
| namespace {
|
|
|
| @@ -26,16 +26,16 @@ namespace media {
|
|
|
| VideoCaptureHandlerProxy::VideoCaptureHandlerProxy(
|
| VideoCapture::EventHandler* proxied,
|
| - scoped_refptr<base::MessageLoopProxy> main_message_loop)
|
| + const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner)
|
| : proxied_(proxied),
|
| - main_message_loop_(main_message_loop) {
|
| + main_task_runner_(main_task_runner) {
|
| }
|
|
|
| VideoCaptureHandlerProxy::~VideoCaptureHandlerProxy() {
|
| }
|
|
|
| void VideoCaptureHandlerProxy::OnStarted(VideoCapture* capture) {
|
| - main_message_loop_->PostTask(FROM_HERE, base::Bind(
|
| + main_task_runner_->PostTask(FROM_HERE, base::Bind(
|
| &VideoCaptureHandlerProxy::OnStartedOnMainThread,
|
| base::Unretained(this),
|
| capture,
|
| @@ -43,7 +43,7 @@ void VideoCaptureHandlerProxy::OnStarted(VideoCapture* capture) {
|
| }
|
|
|
| void VideoCaptureHandlerProxy::OnStopped(VideoCapture* capture) {
|
| - main_message_loop_->PostTask(FROM_HERE, base::Bind(
|
| + main_task_runner_->PostTask(FROM_HERE, base::Bind(
|
| &VideoCaptureHandlerProxy::OnStoppedOnMainThread,
|
| base::Unretained(this),
|
| capture,
|
| @@ -51,7 +51,7 @@ void VideoCaptureHandlerProxy::OnStopped(VideoCapture* capture) {
|
| }
|
|
|
| void VideoCaptureHandlerProxy::OnPaused(VideoCapture* capture) {
|
| - main_message_loop_->PostTask(FROM_HERE, base::Bind(
|
| + main_task_runner_->PostTask(FROM_HERE, base::Bind(
|
| &VideoCaptureHandlerProxy::OnPausedOnMainThread,
|
| base::Unretained(this),
|
| capture,
|
| @@ -59,7 +59,7 @@ void VideoCaptureHandlerProxy::OnPaused(VideoCapture* capture) {
|
| }
|
|
|
| void VideoCaptureHandlerProxy::OnError(VideoCapture* capture, int error_code) {
|
| - main_message_loop_->PostTask(FROM_HERE, base::Bind(
|
| + main_task_runner_->PostTask(FROM_HERE, base::Bind(
|
| &VideoCaptureHandlerProxy::OnErrorOnMainThread,
|
| base::Unretained(this),
|
| capture,
|
| @@ -68,7 +68,7 @@ void VideoCaptureHandlerProxy::OnError(VideoCapture* capture, int error_code) {
|
| }
|
|
|
| void VideoCaptureHandlerProxy::OnRemoved(VideoCapture* capture) {
|
| - main_message_loop_->PostTask(FROM_HERE, base::Bind(
|
| + main_task_runner_->PostTask(FROM_HERE, base::Bind(
|
| &VideoCaptureHandlerProxy::OnRemovedOnMainThread,
|
| base::Unretained(this),
|
| capture,
|
| @@ -78,7 +78,7 @@ void VideoCaptureHandlerProxy::OnRemoved(VideoCapture* capture) {
|
| void VideoCaptureHandlerProxy::OnFrameReady(
|
| VideoCapture* capture,
|
| const scoped_refptr<VideoFrame>& frame) {
|
| - main_message_loop_->PostTask(
|
| + main_task_runner_->PostTask(
|
| FROM_HERE,
|
| base::Bind(&VideoCaptureHandlerProxy::OnFrameReadyOnMainThread,
|
| base::Unretained(this),
|
|
|