| Index: content/browser/webrtc/webrtc_getusermedia_browsertest.cc
|
| diff --git a/content/browser/webrtc/webrtc_getusermedia_browsertest.cc b/content/browser/webrtc/webrtc_getusermedia_browsertest.cc
|
| index 84be043909d59599ffd272425fd1fa360247ead1..2134cfbf732decb03e9e1e187de96cc1affc717c 100644
|
| --- a/content/browser/webrtc/webrtc_getusermedia_browsertest.cc
|
| +++ b/content/browser/webrtc/webrtc_getusermedia_browsertest.cc
|
| @@ -27,6 +27,7 @@
|
| #include "content/public/test/test_utils.h"
|
| #include "content/shell/browser/shell.h"
|
| #include "media/audio/audio_manager.h"
|
| +#include "media/audio/fake_audio_input_stream.h"
|
| #include "net/test/embedded_test_server/embedded_test_server.h"
|
| #include "testing/perf/perf_test.h"
|
|
|
| @@ -46,6 +47,8 @@ static const char kGetUserMediaAndAnalyseAndStop[] =
|
| "getUserMediaAndAnalyseAndStop";
|
| static const char kGetUserMediaAndExpectFailure[] =
|
| "getUserMediaAndExpectFailure";
|
| +static const char kGetUserMediaForAudioMutingTest[] =
|
| + "getUserMediaForAudioMutingTest";
|
| static const char kRenderSameTrackMediastreamAndStop[] =
|
| "renderSameTrackMediastreamAndStop";
|
| static const char kRenderClonedMediastreamAndStop[] =
|
| @@ -1451,4 +1454,53 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaOldConstraintsBrowserTest,
|
| MediaStreamManager::GenerateStreamTestCallback());
|
| }
|
|
|
| +IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
|
| + GetAudioStreamAndCheckMutingInitiallyUnmuted) {
|
| + ASSERT_TRUE(embedded_test_server()->Start());
|
| +
|
| + GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
|
| + NavigateToURL(shell(), url);
|
| +
|
| + // Expect stream to initially not be muted
|
| + media::FakeAudioInputStream::SetMutedState(false);
|
| + ExecuteJavascriptAndWaitForOk(
|
| + base::StringPrintf("%s(false);", kGetUserMediaForAudioMutingTest));
|
| +
|
| + // Mute
|
| + media::FakeAudioInputStream::SetMutedState(true);
|
| + EXPECT_EQ("onmute: muted=true, readyState=live",
|
| + ExecuteJavascriptAndReturnResult(
|
| + "failTestAfterTimeout('Got no mute event', 1500);"));
|
| + // Unmute
|
| + media::FakeAudioInputStream::SetMutedState(false);
|
| + EXPECT_EQ("onunmute: muted=false, readyState=live",
|
| + ExecuteJavascriptAndReturnResult(
|
| + "failTestAfterTimeout('Got no unmute event', 1500);"));
|
| +}
|
| +
|
| +IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
|
| + GetAudioStreamAndCheckMutingInitiallyMuted) {
|
| + ASSERT_TRUE(embedded_test_server()->Start());
|
| +
|
| + GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
|
| + NavigateToURL(shell(), url);
|
| +
|
| + // Expect stream to initially be muted
|
| + media::FakeAudioInputStream::SetMutedState(true);
|
| + ExecuteJavascriptAndWaitForOk(
|
| + base::StringPrintf("%s(true);", kGetUserMediaForAudioMutingTest));
|
| +
|
| + // Unmute
|
| + media::FakeAudioInputStream::SetMutedState(false);
|
| + EXPECT_EQ("onunmute: muted=false, readyState=live",
|
| + ExecuteJavascriptAndReturnResult(
|
| + "failTestAfterTimeout('Got no unmute event', 1500);"));
|
| +
|
| + // Mute
|
| + media::FakeAudioInputStream::SetMutedState(true);
|
| + EXPECT_EQ("onmute: muted=true, readyState=live",
|
| + ExecuteJavascriptAndReturnResult(
|
| + "failTestAfterTimeout('Got no mute event', 1500);"));
|
| +}
|
| +
|
| } // namespace content
|
|
|