Commit 3554c03c authored by Mark Pilgrim's avatar Mark Pilgrim Committed by Commit Bot

Migrate MediaStreamManager::GenerateStreamCallback to BindOnce

Bug: 714018
Change-Id: I6424da4665e0f5e4bdb8ad03b30ad5ff41d28b1f
Reviewed-on: https://chromium-review.googlesource.com/1061813Reviewed-by: default avatarEmircan Uysaler <emircan@chromium.org>
Commit-Queue: Mark Pilgrim <pilgrim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#559147}
parent 4fd7afdc
...@@ -628,7 +628,7 @@ void MediaStreamManager::GenerateStream( ...@@ -628,7 +628,7 @@ void MediaStreamManager::GenerateStream(
// The test callback is responsible to verify whether the |controls| is // The test callback is responsible to verify whether the |controls| is
// as expected. Then we need to finish getUserMedia and let Javascript // as expected. Then we need to finish getUserMedia and let Javascript
// access the result. // access the result.
if (generate_stream_test_callback_.Run(controls)) { if (std::move(generate_stream_test_callback_).Run(controls)) {
FinalizeGenerateStream(label, request); FinalizeGenerateStream(label, request);
} else { } else {
FinalizeRequestFailed(label, request, MEDIA_DEVICE_INVALID_STATE); FinalizeRequestFailed(label, request, MEDIA_DEVICE_INVALID_STATE);
......
...@@ -98,7 +98,7 @@ class CONTENT_EXPORT MediaStreamManager ...@@ -98,7 +98,7 @@ class CONTENT_EXPORT MediaStreamManager
// Callback for testing. // Callback for testing.
using GenerateStreamTestCallback = using GenerateStreamTestCallback =
base::Callback<bool(const StreamControls&)>; base::OnceCallback<bool(const StreamControls&)>;
// Adds |message| to native logs for outstanding device requests, for use by // Adds |message| to native logs for outstanding device requests, for use by
// render processes hosts whose corresponding render processes are requesting // render processes hosts whose corresponding render processes are requesting
......
...@@ -648,13 +648,13 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, ...@@ -648,13 +648,13 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
BrowserMainLoop::GetInstance()->media_stream_manager(); BrowserMainLoop::GetInstance()->media_stream_manager();
manager->SetGenerateStreamCallbackForTesting( manager->SetGenerateStreamCallbackForTesting(
base::Bind(&VerifyDisableLocalEcho, false)); base::BindOnce(&VerifyDisableLocalEcho, false));
std::string call = GenerateGetUserMediaWithDisableLocalEcho( std::string call = GenerateGetUserMediaWithDisableLocalEcho(
"getUserMediaAndExpectSuccess", "false"); "getUserMediaAndExpectSuccess", "false");
ExecuteJavascriptAndWaitForOk(call); ExecuteJavascriptAndWaitForOk(call);
manager->SetGenerateStreamCallbackForTesting( manager->SetGenerateStreamCallbackForTesting(
base::Bind(&VerifyDisableLocalEcho, true)); base::BindOnce(&VerifyDisableLocalEcho, true));
call = GenerateGetUserMediaWithDisableLocalEcho( call = GenerateGetUserMediaWithDisableLocalEcho(
"getUserMediaAndExpectSuccess", "true"); "getUserMediaAndExpectSuccess", "true");
ExecuteJavascriptAndWaitForOk(call); ExecuteJavascriptAndWaitForOk(call);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment