| Index: content/browser/renderer_host/media/video_capture_controller_unittest.cc
|
| diff --git a/content/browser/renderer_host/media/video_capture_controller_unittest.cc b/content/browser/renderer_host/media/video_capture_controller_unittest.cc
|
| index 70cef133f393e8ca1e1d51d4589351e2bcf761b0..d27fac393e88fd61ca43896cf1fba85ebbd5e701 100644
|
| --- a/content/browser/renderer_host/media/video_capture_controller_unittest.cc
|
| +++ b/content/browser/renderer_host/media/video_capture_controller_unittest.cc
|
| @@ -8,10 +8,11 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| +#include "base/location.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "base/message_loop/message_loop.h"
|
| #include "base/run_loop.h"
|
| +#include "base/single_thread_task_runner.h"
|
| #include "base/thread_task_runner_handle.h"
|
| #include "content/browser/renderer_host/media/media_stream_provider.h"
|
| #include "content/browser/renderer_host/media/video_capture_controller.h"
|
| @@ -73,14 +74,10 @@ class MockVideoCaptureControllerEventHandler
|
| const base::TimeTicks& timestamp,
|
| scoped_ptr<base::DictionaryValue> metadata) override {
|
| DoBufferReady(id, coded_size);
|
| - base::MessageLoop::current()->PostTask(
|
| + base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| FROM_HERE,
|
| base::Bind(&VideoCaptureController::ReturnBuffer,
|
| - base::Unretained(controller_),
|
| - id,
|
| - this,
|
| - buffer_id,
|
| - 0));
|
| + base::Unretained(controller_), id, this, buffer_id, 0));
|
| }
|
| void OnMailboxBufferReady(
|
| VideoCaptureControllerID id,
|
| @@ -90,19 +87,16 @@ class MockVideoCaptureControllerEventHandler
|
| const base::TimeTicks& timestamp,
|
| scoped_ptr<base::DictionaryValue> metadata) override {
|
| DoMailboxBufferReady(id);
|
| - base::MessageLoop::current()->PostTask(
|
| - FROM_HERE,
|
| - base::Bind(&VideoCaptureController::ReturnBuffer,
|
| - base::Unretained(controller_),
|
| - id,
|
| - this,
|
| - buffer_id,
|
| - mailbox_holder.sync_point));
|
| + base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| + FROM_HERE, base::Bind(&VideoCaptureController::ReturnBuffer,
|
| + base::Unretained(controller_), id, this,
|
| + buffer_id, mailbox_holder.sync_point));
|
| }
|
| void OnEnded(VideoCaptureControllerID id) override {
|
| DoEnded(id);
|
| // OnEnded() must respond by (eventually) unregistering the client.
|
| - base::MessageLoop::current()->PostTask(FROM_HERE,
|
| + base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| + FROM_HERE,
|
| base::Bind(base::IgnoreResult(&VideoCaptureController::RemoveClient),
|
| base::Unretained(controller_), id, this));
|
| }
|
|
|