Index: content/browser/renderer_host/media/video_capture_host_unittest.cc |
diff --git a/content/browser/renderer_host/media/video_capture_host_unittest.cc b/content/browser/renderer_host/media/video_capture_host_unittest.cc |
index 763ed1f9ca83edcafa1e45d3e0904002209de377..878ea584276743a7cb71994409db673f1285d657 100644 |
--- a/content/browser/renderer_host/media/video_capture_host_unittest.cc |
+++ b/content/browser/renderer_host/media/video_capture_host_unittest.cc |
@@ -9,11 +9,13 @@ |
#include "base/command_line.h" |
#include "base/files/file_util.h" |
#include "base/files/scoped_file.h" |
+#include "base/location.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/stl_util.h" |
#include "base/strings/stringprintf.h" |
+#include "base/thread_task_runner_handle.h" |
#include "content/browser/browser_thread_impl.h" |
#include "content/browser/renderer_host/media/media_stream_manager.h" |
#include "content/browser/renderer_host/media/media_stream_requester.h" |
@@ -272,8 +274,8 @@ class MockVideoCaptureHost : public VideoCaptureHost { |
DumpVideo dumper_; |
}; |
-ACTION_P2(ExitMessageLoop, message_loop, quit_closure) { |
- message_loop->PostTask(FROM_HERE, quit_closure); |
+ACTION_P2(ExitMessageLoop, task_runner, quit_closure) { |
+ task_runner->PostTask(FROM_HERE, quit_closure); |
} |
// This is an integration test of VideoCaptureHost in conjunction with |
@@ -283,7 +285,7 @@ class VideoCaptureHostTest : public testing::Test { |
public: |
VideoCaptureHostTest() |
: thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP), |
- message_loop_(base::MessageLoopProxy::current()), |
+ task_runner_(base::ThreadTaskRunnerHandle::Get()), |
opened_session_id_(kInvalidMediaCaptureSessionId) {} |
void SetUp() override { |
@@ -349,13 +351,11 @@ class VideoCaptureHostTest : public testing::Test { |
page_request_id, |
MEDIA_DEVICE_VIDEO_CAPTURE, |
security_origin); |
- EXPECT_CALL(stream_requester_, DevicesEnumerated(render_frame_id, |
- page_request_id, |
- label, |
- _)) |
- .Times(1).WillOnce( |
- DoAll(ExitMessageLoop(message_loop_, run_loop.QuitClosure()), |
- SaveArg<3>(&devices))); |
+ EXPECT_CALL(stream_requester_, |
+ DevicesEnumerated(render_frame_id, page_request_id, label, _)) |
+ .Times(1) |
+ .WillOnce(DoAll(ExitMessageLoop(task_runner_, run_loop.QuitClosure()), |
+ SaveArg<3>(&devices))); |
run_loop.Run(); |
Mock::VerifyAndClearExpectations(&stream_requester_); |
media_stream_manager_->CancelRequest(label); |
@@ -376,14 +376,12 @@ class VideoCaptureHostTest : public testing::Test { |
devices[0].device.id, |
MEDIA_DEVICE_VIDEO_CAPTURE, |
security_origin); |
- EXPECT_CALL(stream_requester_, DeviceOpened(render_frame_id, |
- page_request_id, |
- _, |
- _)) |
- .Times(1).WillOnce( |
- DoAll(ExitMessageLoop(message_loop_, run_loop.QuitClosure()), |
- SaveArg<2>(&opened_device_label_), |
- SaveArg<3>(&opened_device))); |
+ EXPECT_CALL(stream_requester_, |
+ DeviceOpened(render_frame_id, page_request_id, _, _)) |
+ .Times(1) |
+ .WillOnce(DoAll(ExitMessageLoop(task_runner_, run_loop.QuitClosure()), |
+ SaveArg<2>(&opened_device_label_), |
+ SaveArg<3>(&opened_device))); |
run_loop.Run(); |
Mock::VerifyAndClearExpectations(&stream_requester_); |
ASSERT_NE(StreamDeviceInfo::kNoId, opened_device.session_id); |
@@ -408,7 +406,7 @@ class VideoCaptureHostTest : public testing::Test { |
base::RunLoop run_loop; |
EXPECT_CALL(*host_.get(), OnBufferFilled(kDeviceId, _, _, _, _, _)) |
.Times(AnyNumber()) |
- .WillOnce(ExitMessageLoop(message_loop_, run_loop.QuitClosure())); |
+ .WillOnce(ExitMessageLoop(task_runner_, run_loop.QuitClosure())); |
media::VideoCaptureParams params; |
params.requested_format = media::VideoCaptureFormat( |
@@ -457,7 +455,7 @@ class VideoCaptureHostTest : public testing::Test { |
base::RunLoop run_loop; |
EXPECT_CALL(*host_.get(), |
OnStateChanged(kDeviceId, VIDEO_CAPTURE_STATE_STOPPED)) |
- .WillOnce(ExitMessageLoop(message_loop_, run_loop.QuitClosure())); |
+ .WillOnce(ExitMessageLoop(task_runner_, run_loop.QuitClosure())); |
host_->OnStopCapture(kDeviceId); |
host_->SetReturnReceivedDibs(true); |
@@ -474,7 +472,7 @@ class VideoCaptureHostTest : public testing::Test { |
base::RunLoop run_loop; |
EXPECT_CALL(*host_.get(), OnBufferFilled(kDeviceId, _, _, _, _, _)) |
.Times(AnyNumber()) |
- .WillOnce(ExitMessageLoop(message_loop_, run_loop.QuitClosure())) |
+ .WillOnce(ExitMessageLoop(task_runner_, run_loop.QuitClosure())) |
.RetiresOnSaturation(); |
run_loop.Run(); |
} |
@@ -512,7 +510,7 @@ class VideoCaptureHostTest : public testing::Test { |
content::TestBrowserThreadBundle thread_bundle_; |
content::TestBrowserContext browser_context_; |
content::TestContentBrowserClient browser_client_; |
- scoped_refptr<base::MessageLoopProxy> message_loop_; |
+ scoped_refptr<base::SingleThreadTaskRunner> task_runner_; |
int opened_session_id_; |
std::string opened_device_label_; |